summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2016-08-11 15:18:16 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-17 10:35:15 +0100
commit26d7e5060a35d20df6f2586b70ed8d2853cc0186 (patch)
tree4a2ec33844bb63dbc9c476b8ca0434d75516a421
parent0575e8c9fb52a7b594025fd20445a2edd06e3c69 (diff)
downloadopenembedded-core-contrib-26d7e5060a35d20df6f2586b70ed8d2853cc0186.tar.gz
openembedded-core-contrib-26d7e5060a35d20df6f2586b70ed8d2853cc0186.tar.bz2
openembedded-core-contrib-26d7e5060a35d20df6f2586b70ed8d2853cc0186.zip
oeqa/runtime/syslog.py: Improve test_syslog_logger on systemd
When an image uses systemd journald acts as a main syslog daemon using /dev/log. The test_syslog_logger try to log a predifined message into the syslog using logger and then search using grep in /var/log/messages if this fails for some reason (file rotated) now search the predifined message into the journal. Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/lib/oeqa/runtime/syslog.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/lib/oeqa/runtime/syslog.py b/meta/lib/oeqa/runtime/syslog.py
index cce3c221d6..8f550329e7 100644
--- a/meta/lib/oeqa/runtime/syslog.py
+++ b/meta/lib/oeqa/runtime/syslog.py
@@ -22,8 +22,11 @@ class SyslogTestConfig(oeRuntimeTest):
self.assertEqual(status, 0, msg="Can't log into syslog. Output: %s " % output)
(status, output) = self.target.run('grep foobar /var/log/messages')
- if status != 0 and not oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", "") == "systemd":
- (status, output) = self.target.run('logread | grep foobar')
+ if status != 0:
+ if oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", "") == "systemd":
+ (status, output) = self.target.run('journalctl -o cat | grep foobar')
+ else:
+ (status, output) = self.target.run('logread | grep foobar')
self.assertEqual(status, 0, msg="Test log string not found in /var/log/messages or logread. Output: %s " % output)
@testcase(1150)