diff options
Diffstat (limited to 'meta/lib/oeqa/runtime')
-rw-r--r-- | meta/lib/oeqa/runtime/skeletoninit.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/runtime/syslog.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oeqa/runtime/skeletoninit.py b/meta/lib/oeqa/runtime/skeletoninit.py index 7c7f402e5d..cb0cb9b4cf 100644 --- a/meta/lib/oeqa/runtime/skeletoninit.py +++ b/meta/lib/oeqa/runtime/skeletoninit.py | |||
@@ -13,7 +13,7 @@ def setUpModule(): | |||
13 | class SkeletonBasicTest(oeRuntimeTest): | 13 | class SkeletonBasicTest(oeRuntimeTest): |
14 | 14 | ||
15 | @skipUnlessPassed('test_ssh') | 15 | @skipUnlessPassed('test_ssh') |
16 | @unittest.skipIf("systemd" == oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager"), "Not appropiate for systemd image") | 16 | @unittest.skipIf("systemd" == oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", False), "Not appropiate for systemd image") |
17 | def test_skeleton_availability(self): | 17 | def test_skeleton_availability(self): |
18 | (status, output) = self.target.run('ls /etc/init.d/skeleton') | 18 | (status, output) = self.target.run('ls /etc/init.d/skeleton') |
19 | self.assertEqual(status, 0, msg = "skeleton init script not found. Output:\n%s " % output) | 19 | self.assertEqual(status, 0, msg = "skeleton init script not found. Output:\n%s " % output) |
@@ -22,7 +22,7 @@ class SkeletonBasicTest(oeRuntimeTest): | |||
22 | 22 | ||
23 | @testcase(284) | 23 | @testcase(284) |
24 | @skipUnlessPassed('test_skeleton_availability') | 24 | @skipUnlessPassed('test_skeleton_availability') |
25 | @unittest.skipIf("systemd" == oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager"), "Not appropiate for systemd image") | 25 | @unittest.skipIf("systemd" == oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", False), "Not appropiate for systemd image") |
26 | def test_skeleton_script(self): | 26 | def test_skeleton_script(self): |
27 | output1 = self.target.run("/etc/init.d/skeleton start")[1] | 27 | output1 = self.target.run("/etc/init.d/skeleton start")[1] |
28 | (status, output2) = self.target.run(oeRuntimeTest.pscmd + ' | grep [s]keleton-test') | 28 | (status, output2) = self.target.run(oeRuntimeTest.pscmd + ' | grep [s]keleton-test') |
diff --git a/meta/lib/oeqa/runtime/syslog.py b/meta/lib/oeqa/runtime/syslog.py index 7fa018e97f..5d0f548c99 100644 --- a/meta/lib/oeqa/runtime/syslog.py +++ b/meta/lib/oeqa/runtime/syslog.py | |||
@@ -29,7 +29,7 @@ class SyslogTestConfig(oeRuntimeTest): | |||
29 | 29 | ||
30 | @skipUnlessPassed("test_syslog_running") | 30 | @skipUnlessPassed("test_syslog_running") |
31 | def test_syslog_restart(self): | 31 | def test_syslog_restart(self): |
32 | if "systemd" != oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager"): | 32 | if "systemd" != oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", False): |
33 | (status,output) = self.target.run('/etc/init.d/syslog restart') | 33 | (status,output) = self.target.run('/etc/init.d/syslog restart') |
34 | else: | 34 | else: |
35 | (status,output) = self.target.run('systemctl restart syslog.service') | 35 | (status,output) = self.target.run('systemctl restart syslog.service') |
@@ -37,7 +37,7 @@ class SyslogTestConfig(oeRuntimeTest): | |||
37 | @testcase(202) | 37 | @testcase(202) |
38 | @skipUnlessPassed("test_syslog_restart") | 38 | @skipUnlessPassed("test_syslog_restart") |
39 | @skipUnlessPassed("test_syslog_logger") | 39 | @skipUnlessPassed("test_syslog_logger") |
40 | @unittest.skipIf("systemd" == oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager"), "Not appropiate for systemd image") | 40 | @unittest.skipIf("systemd" == oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", False), "Not appropiate for systemd image") |
41 | def test_syslog_startup_config(self): | 41 | def test_syslog_startup_config(self): |
42 | self.target.run('echo "LOGFILE=/var/log/test" >> /etc/syslog-startup.conf') | 42 | self.target.run('echo "LOGFILE=/var/log/test" >> /etc/syslog-startup.conf') |
43 | (status,output) = self.target.run('/etc/init.d/syslog restart') | 43 | (status,output) = self.target.run('/etc/init.d/syslog restart') |