From 5c58ba9fca102b58dc1116b6f4c3ead38c68dea7 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 5 Dec 2013 12:56:00 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/connman.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'meta/lib/oeqa') 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(): class ConnmanTest(oeRuntimeTest): + def service_status(self, service): + if oeRuntimeTest.hasFeature("systemd"): + (status, output) = self.target.run('systemctl status -l %s' % service) + return output + else: + return "Unable to get status or logs for %s" % service + @skipUnlessPassed('test_ssh') def test_connmand_help(self): (status, output) = self.target.run('/usr/sbin/connmand --help') @@ -18,4 +25,6 @@ class ConnmanTest(oeRuntimeTest): @skipUnlessPassed('test_connmand_help') def test_connmand_running(self): (status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep [c]onnmand') - self.assertEqual(status, 0, msg="no connmand process, ps output: %s" % self.target.run(oeRuntimeTest.pscmd)[1]) + if status != 0: + print self.service_status("connman") + self.fail("No connmand process running") -- cgit v1.2.3-54-g00ecf