Simplify the service monitoring test script

[connman] / test / test-manager

diff --git a/test/test-manager b/test/test-manager
index ea976ca..28a20de 100755 (executable)
--- a/test/test-manager
+++ b/test/test-manager
@@ -16,6 +16,8 @@ def print_properties(key, value):
                interface = "org.moblin.connman.Device"
        elif key == "Connections":
                interface = "org.moblin.connman.Connection"
+       elif key == "Services":
+               interface = "org.moblin.connman.Service"
        else:
                return
 
@@ -28,7 +30,7 @@ def print_properties(key, value):
                properties = obj.GetProperties()
 
                for key in properties.keys():
-                       if key == "Networks":
+                       if key in ["Networks", "Services"]:
                                continue
 
                        if key in ["Powered", "Scanning", "Connected",
@@ -37,7 +39,7 @@ def print_properties(key, value):
                                        val = "true"
                                else:
                                        val = "false"
-                       elif key == "Strength":
+                       elif key in ["Strength", "Priority"]:
                                val = int(properties[key])
                        else:
                                val = str(properties[key])
@@ -50,11 +52,17 @@ def print_properties(key, value):
                                val = str(path)
                                list = list + val[val.rfind("/") + 1:] + " "
                        print "        Networks = [ %s]" % (list)
+               if "Services" in properties.keys():
+                       list = ""
+                       for path in properties["Services"]:
+                               val = str(path)
+                               list = list + val[val.rfind("/") + 1:] + " "
+                       print "        Services = [ %s]" % (list)
 
 for key in properties.keys():
-       if key in ["Profiles", "Devices", "Connections"]:
+       if key in ["Profiles", "Devices", "Connections", "Services"]:
                print_properties(key, properties[key])
-       elif key in ["FlightMode"]:
+       elif key in ["OfflineMode"]:
                print "%s" % (key)
                if properties[key] == dbus.Boolean(1):
                        print "    true"