[oe-commits] [openembedded-core] 48/62: oeqa/runtime/syslog.py: Improve test_syslog_logger on systemd
git at git.openembedded.org
git at git.openembedded.org
Wed Aug 17 09:37:05 UTC 2016
rpurdie pushed a commit to branch master
in repository openembedded-core.
commit 26d7e5060a35d20df6f2586b70ed8d2853cc0186
Author: Aníbal Limón <anibal.limon at linux.intel.com>
AuthorDate: Thu Aug 11 15:18:16 2016 -0500
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 at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/lib/oeqa/runtime/syslog.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/runtime/syslog.py b/meta/lib/oeqa/runtime/syslog.py
index cce3c22..8f55032 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)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list