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:43 +0100
commitdde033ab4cf152b38a9b507660d78350965620ef (patch)
tree47a81cde7ab57da815aead80596912f8aaa10306
parent0cff756e15fe69be6e17bc46863f4b57a43e20a8 (diff)
downloadpoky-dde033ab4cf152b38a9b507660d78350965620ef.tar.gz
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. (From OE-Core rev: 26d7e5060a35d20df6f2586b70ed8d2853cc0186) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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):
22 self.assertEqual(status, 0, msg="Can't log into syslog. Output: %s " % output) 22 self.assertEqual(status, 0, msg="Can't log into syslog. Output: %s " % output)
23 23
24 (status, output) = self.target.run('grep foobar /var/log/messages') 24 (status, output) = self.target.run('grep foobar /var/log/messages')
25 if status != 0 and not oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", "") == "systemd": 25 if status != 0:
26 (status, output) = self.target.run('logread | grep foobar') 26 if oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", "") == "systemd":
27 (status, output) = self.target.run('journalctl -o cat | grep foobar')
28 else:
29 (status, output) = self.target.run('logread | grep foobar')
27 self.assertEqual(status, 0, msg="Test log string not found in /var/log/messages or logread. Output: %s " % output) 30 self.assertEqual(status, 0, msg="Test log string not found in /var/log/messages or logread. Output: %s " % output)
28 31
29 @testcase(1150) 32 @testcase(1150)