From: Aníbal Limón Date: Wed, 27 Jul 2016 22:40:38 +0000 (-0500) Subject: oeqa/runtime/syslog.py: Improve test_syslog_logger X-Git-Tag: uninative-1.3~126 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f3fe3590e887ee311f23723103eca41dcf58aa8b;p=openembedded-core.git oeqa/runtime/syslog.py: Improve test_syslog_logger Instead of make all the testing in a shell one liner, divide the test into 3 operations to be able to know in what part is failing. Parts, - Log message to syslog - Review if message exist in /var/log/messages - Review if message exist using logread Signed-off-by: Aníbal Limón Signed-off-by: Ross Burton --- diff --git a/meta/lib/oeqa/runtime/syslog.py b/meta/lib/oeqa/runtime/syslog.py index f7421ec8c5..202a63f2af 100644 --- a/meta/lib/oeqa/runtime/syslog.py +++ b/meta/lib/oeqa/runtime/syslog.py @@ -18,8 +18,13 @@ class SyslogTestConfig(oeRuntimeTest): @testcase(1149) @skipUnlessPassed("test_syslog_running") def test_syslog_logger(self): - (status,output) = self.target.run('logger foobar && test -e /var/log/messages && grep foobar /var/log/messages || logread | grep foobar') - self.assertEqual(status, 0, msg="Test log string not found in /var/log/messages. Output: %s " % output) + (status, output) = self.target.run('logger foobar') + 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: + (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) @skipUnlessPassed("test_syslog_running")