diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/runtime/syslog.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/lib/oeqa/runtime/syslog.py b/meta/lib/oeqa/runtime/syslog.py index 31cd6b0139..dbaf8c6253 100644 --- a/meta/lib/oeqa/runtime/syslog.py +++ b/meta/lib/oeqa/runtime/syslog.py | |||
@@ -8,19 +8,12 @@ def setUpModule(): | |||
8 | 8 | ||
9 | class SyslogTest(oeRuntimeTest): | 9 | class SyslogTest(oeRuntimeTest): |
10 | 10 | ||
11 | @testcase(1148) | ||
12 | @skipUnlessPassed("test_ssh") | ||
13 | def test_syslog_help(self): | ||
14 | (status,output) = self.target.run('/sbin/syslogd --help') | ||
15 | self.assertEqual(status, 0, msg="status and output: %s and %s" % (status,output)) | ||
16 | |||
17 | @testcase(201) | 11 | @testcase(201) |
18 | @skipUnlessPassed("test_syslog_help") | 12 | @skipUnlessPassed("test_syslog_help") |
19 | def test_syslog_running(self): | 13 | def test_syslog_running(self): |
20 | (status,output) = self.target.run(oeRuntimeTest.pscmd + ' | grep -i [s]yslogd') | 14 | (status,output) = self.target.run(oeRuntimeTest.pscmd + ' | grep -i [s]yslogd') |
21 | self.assertEqual(status, 0, msg="no syslogd process, ps output: %s" % self.target.run(oeRuntimeTest.pscmd)[1]) | 15 | self.assertEqual(status, 0, msg="no syslogd process, ps output: %s" % self.target.run(oeRuntimeTest.pscmd)[1]) |
22 | 16 | ||
23 | |||
24 | class SyslogTestConfig(oeRuntimeTest): | 17 | class SyslogTestConfig(oeRuntimeTest): |
25 | 18 | ||
26 | @testcase(1149) | 19 | @testcase(1149) |
@@ -41,6 +34,7 @@ class SyslogTestConfig(oeRuntimeTest): | |||
41 | @skipUnlessPassed("test_syslog_restart") | 34 | @skipUnlessPassed("test_syslog_restart") |
42 | @skipUnlessPassed("test_syslog_logger") | 35 | @skipUnlessPassed("test_syslog_logger") |
43 | @unittest.skipIf("systemd" == oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", False), "Not appropiate for systemd image") | 36 | @unittest.skipIf("systemd" == oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", False), "Not appropiate for systemd image") |
37 | @unittest.skipIf(oeRuntimeTest.hasPackage("sysklogd") or not oeRuntimeTest.hasPackage("busybox"), "Non-busybox syslog") | ||
44 | def test_syslog_startup_config(self): | 38 | def test_syslog_startup_config(self): |
45 | self.target.run('echo "LOGFILE=/var/log/test" >> /etc/syslog-startup.conf') | 39 | self.target.run('echo "LOGFILE=/var/log/test" >> /etc/syslog-startup.conf') |
46 | (status,output) = self.target.run('/etc/init.d/syslog restart') | 40 | (status,output) = self.target.run('/etc/init.d/syslog restart') |