From: Chen Qi <Qi.Chen@windriver.com>
Date: Tue, 31 Jul 2018 01:25:01 +0000 (+0800)
Subject: oe_syslog.py: fix settings in OEHasPackage decorator
X-Git-Tag: uninative-2.3~827
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=119c22342d446e4f638b8d4c81480ebc7b444245;p=openembedded-core.git

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@windriver.com>
---

diff --git a/meta/lib/oeqa/runtime/cases/oe_syslog.py b/meta/lib/oeqa/runtime/cases/oe_syslog.py
index 005b6978d9..935f10f0f3 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):