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.
Signed-off-by: Ross Burton <ross.bur...@intel.com>
---
meta/lib/oeqa/runtime/connman.py | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/runtime/connman.py b/meta/lib/oeqa/runtime/connman.py
index b592ecc..c036882 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")
--
1.7.10.4
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
