[OE-core] [PATCH] oeqa/syslog: Removed a pointless testcase and added skip for another.
Lucian Musat
george.l.musat at intel.com
Mon Jul 20 14:51:10 UTC 2015
The testcase syslog --help was rather useless and also causing problems
on images where syslog was non-busybox, like LSB images so I removed it.
Added a skip condition for TC 202 for the same reason. If syslog is
non-busybox then the test skips.
Signed-off-by: Lucian Musat <george.l.musat at intel.com>
---
meta/lib/oeqa/runtime/syslog.py | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/meta/lib/oeqa/runtime/syslog.py b/meta/lib/oeqa/runtime/syslog.py
index 31cd6b0..dbaf8c6 100644
--- a/meta/lib/oeqa/runtime/syslog.py
+++ b/meta/lib/oeqa/runtime/syslog.py
@@ -8,19 +8,12 @@ def setUpModule():
class SyslogTest(oeRuntimeTest):
- @testcase(1148)
- @skipUnlessPassed("test_ssh")
- def test_syslog_help(self):
- (status,output) = self.target.run('/sbin/syslogd --help')
- self.assertEqual(status, 0, msg="status and output: %s and %s" % (status,output))
-
@testcase(201)
@skipUnlessPassed("test_syslog_help")
def test_syslog_running(self):
(status,output) = self.target.run(oeRuntimeTest.pscmd + ' | grep -i [s]yslogd')
self.assertEqual(status, 0, msg="no syslogd process, ps output: %s" % self.target.run(oeRuntimeTest.pscmd)[1])
-
class SyslogTestConfig(oeRuntimeTest):
@testcase(1149)
@@ -41,6 +34,7 @@ class SyslogTestConfig(oeRuntimeTest):
@skipUnlessPassed("test_syslog_restart")
@skipUnlessPassed("test_syslog_logger")
@unittest.skipIf("systemd" == oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", False), "Not appropiate for systemd image")
+ @unittest.skipIf(oeRuntimeTest.hasPackage("sysklogd") or not oeRuntimeTest.hasPackage("busybox"), "Non-busybox syslog")
def test_syslog_startup_config(self):
self.target.run('echo "LOGFILE=/var/log/test" >> /etc/syslog-startup.conf')
(status,output) = self.target.run('/etc/init.d/syslog restart')
--
2.1.4
More information about the Openembedded-core
mailing list