diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2018-07-31 09:25:01 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-31 22:42:03 +0100 |
| commit | 119c22342d446e4f638b8d4c81480ebc7b444245 (patch) | |
| tree | e316516f7b878e630e77e092e4a9055435f2872d /meta/lib/oeqa | |
| parent | 751fc7802f57a836a0be5fc6a8d5fdf8b1769c39 (diff) | |
| download | openembedded-core-119c22342d446e4f638b8d4c81480ebc7b444245.tar.gz | |
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>
Diffstat (limited to 'meta/lib/oeqa')
| -rw-r--r-- | meta/lib/oeqa/runtime/cases/oe_syslog.py | 4 |
1 files 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 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): |