summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-12-05 12:56:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-05 14:25:30 +0000
commit5c58ba9fca102b58dc1116b6f4c3ead38c68dea7 (patch)
tree6d1559e7d5e35c47f6b69f0511ffb1f89bfbdffc /meta
parent271c98acd57e93976d1e8baea8e24ca9ff2ae8fe (diff)
downloadpoky-5c58ba9fca102b58dc1116b6f4c3ead38c68dea7.tar.gz
lib/oeqa/runtime: print connman status if connman failed to start
If connman isn't running and we're running under systemd, use systemctl to get the state according to systemd and the end of the connman log. (From OE-Core rev: e77bcc8e4baf11701b105d071a979a21a2a303d5) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/runtime/connman.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/lib/oeqa/runtime/connman.py b/meta/lib/oeqa/runtime/connman.py
index b592ecca04..c03688206f 100644
--- a/meta/lib/oeqa/runtime/connman.py
+++ b/meta/lib/oeqa/runtime/connman.py
@@ -9,6 +9,13 @@ def setUpModule():
9 9
10class ConnmanTest(oeRuntimeTest): 10class ConnmanTest(oeRuntimeTest):
11 11
12 def service_status(self, service):
13 if oeRuntimeTest.hasFeature("systemd"):
14 (status, output) = self.target.run('systemctl status -l %s' % service)
15 return output
16 else:
17 return "Unable to get status or logs for %s" % service
18
12 @skipUnlessPassed('test_ssh') 19 @skipUnlessPassed('test_ssh')
13 def test_connmand_help(self): 20 def test_connmand_help(self):
14 (status, output) = self.target.run('/usr/sbin/connmand --help') 21 (status, output) = self.target.run('/usr/sbin/connmand --help')
@@ -18,4 +25,6 @@ class ConnmanTest(oeRuntimeTest):
18 @skipUnlessPassed('test_connmand_help') 25 @skipUnlessPassed('test_connmand_help')
19 def test_connmand_running(self): 26 def test_connmand_running(self):
20 (status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep [c]onnmand') 27 (status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep [c]onnmand')
21 self.assertEqual(status, 0, msg="no connmand process, ps output: %s" % self.target.run(oeRuntimeTest.pscmd)[1]) 28 if status != 0:
29 print self.service_status("connman")
30 self.fail("No connmand process running")