[oe-commits] [openembedded-core] 06/14: oe_syslog.py: fix settings in OEHasPackage decorator

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 119c22342d446e4f638b8d4c81480ebc7b444245
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Tue Jul 31 09:25:01 2018 +0800

    oe_syslog.py: fix settings in OEHasPackage decorator
    
    1. For test_syslog_running, we should not restrict it to run for
       only busybox-syslog and sysklogd. So extend it to all syslog
       providers in oe-core and meta-openembedded.
    
    2. For test_syslog_startup_config, fix to make it depend on the
       existence of busybox-syslog. The previous condition "!sysklogd
       && busybox" is incorrect, because busybox may be compiled without
       syslog support, and sysklogd and busybox-syslog conflict with
       each other.
    
    Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
---
 meta/lib/oeqa/runtime/cases/oe_syslog.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/runtime/cases/oe_syslog.py b/meta/lib/oeqa/runtime/cases/oe_syslog.py
index 005b697..935f10f 100644
--- a/meta/lib/oeqa/runtime/cases/oe_syslog.py
+++ b/meta/lib/oeqa/runtime/cases/oe_syslog.py
@@ -8,7 +8,7 @@ class SyslogTest(OERuntimeTestCase):
 
     @OETestID(201)
     @OETestDepends(['ssh.SSHTest.test_ssh'])
-    @OEHasPackage(["busybox-syslog", "sysklogd"])
+    @OEHasPackage(["busybox-syslog", "sysklogd", "rsyslog", "syslog-ng"])
     def test_syslog_running(self):
         cmd = '%s  | grep -i [s]yslogd' % self.tc.target_cmds['ps']
         status, output = self.target.run(cmd)
@@ -45,7 +45,7 @@ class SyslogTestConfig(OERuntimeTestCase):
 
     @OETestID(202)
     @OETestDepends(['oe_syslog.SyslogTestConfig.test_syslog_logger'])
-    @OEHasPackage(["!sysklogd", "busybox"])
+    @OEHasPackage(["busybox-syslog"])
     @skipIfDataVar('VIRTUAL-RUNTIME_init_manager', 'systemd',
                    'Not appropiate for systemd image')
     def test_syslog_startup_config(self):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.