[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1630/8267] oeqa/runtime/syslog.py: Improve test_syslog_logger

[Emmanuele Bassi <ebassi src gnome org>]

commit b4ba36a9d7261f4d617b4029e81c5fd8503041f2
Author: Aníbal Limón <anibal limon linux intel com>
Date:   Wed Jul 27 17:40:38 2016 -0500

    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
    
    (From OE-Core rev: f3fe3590e887ee311f23723103eca41dcf58aa8b)
    
    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>

 meta/lib/oeqa/runtime/syslog.py |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/meta/lib/oeqa/runtime/syslog.py b/meta/lib/oeqa/runtime/syslog.py
index f7421ec..202a63f 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")