summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/runtime/syslog.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-18 15:14:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 11:57:25 +0100
commit86d30d756a60d181a95cf07041920a367a0cd0ba (patch)
tree950353e2e1cd1e7b812ff941b4d06076acd2c752 /meta/lib/oeqa/runtime/syslog.py
parentf98c8490099a02c42306e1671579631a61c9df73 (diff)
downloadpoky-86d30d756a60d181a95cf07041920a367a0cd0ba.tar.gz
meta: Add explict getVar param for (non) expansion
Rather than just use d.getVar(X), use the more explict d.getVar(X, False) since at some point in the future, having the default of expansion would be nice. This is the first step towards that. This patch was mostly made using the command: sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *` (From OE-Core rev: ab7c1d239b122c8e549e8112c88fd46c9e2b061b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/runtime/syslog.py')
-rw-r--r--meta/lib/oeqa/runtime/syslog.py4
1 files changed, 2 insertions, 2 deletions
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')