test: Fix tethering scripts

[framework/connectivity/connman.git] / test / test-manager

diff --git a/test/test-manager b/test/test-manager
index 2a80b75..a29eaf7 100755 (executable)
--- a/test/test-manager
+++ b/test/test-manager
@@ -25,38 +25,38 @@ def extract_list(list):
 
 bus = dbus.SystemBus()
 
-manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"),
-                                       "org.moblin.connman.Manager")
+manager = dbus.Interface(bus.get_object("net.connman", "/"),
+                                       "net.connman.Manager")
 
 properties = manager.GetProperties()
 
 def print_properties(key, value):
        if key == "Profiles":
-               interface = "org.moblin.connman.Profile"
-       elif key in ["Services", "Providers"]:
-               interface = "org.moblin.connman.Service"
+               interface = "net.connman.Profile"
+       elif key == "Services":
+               interface = "net.connman.Service"
        elif key == "Technologies":
-               interface = "org.moblin.connman.Technology"
+               interface = "net.connman.Technology"
        else:
                return
 
        print "%s" % (key)
        for path in value:
                print "    %s" % (path)
-               obj = dbus.Interface(bus.get_object("org.moblin.connman", path),
+               obj = dbus.Interface(bus.get_object("net.connman", path),
                                                                interface)
 
                properties = obj.GetProperties()
 
                for key in properties.keys():
-                       if key in ["Services", "Providers", "Technologies"]:
+                       if key in ["Services", "Technologies"]:
                                continue
 
                        elif key in ["Powered", "Scanning", "Connected",
                                        "Available", "Remember", "Default",
                                        "Favorite", "Immutable", "AutoConnect",
                                                "LoginRequired", "SetupRequired",
-                                                       "PassphraseRequired"]:
+                                               "PassphraseRequired"]:
                                if properties[key] == dbus.Boolean(1):
                                        val = "true"
                                else:
@@ -69,11 +69,18 @@ def print_properties(key, value):
                                val = extract_values(properties[key])
 
                        elif key in ["Nameservers", "Nameservers.Configuration",
-                                       "Domains", "Domains.Configuration"]:
+                                       "Domains", "Domains.Configuration",
+                                               "Security"]:
                                val = extract_list(properties[key])
 
                        elif key in ["Strength", "Priority"]:
                                val = int(properties[key])
+
+                       elif key in ["Tethering"]:
+                               if properties[key] == dbus.Boolean(1):
+                                       val = "true"
+                               else:
+                                       val = "false"
                        else:
                                val = str(properties[key])
 
@@ -85,16 +92,10 @@ def print_properties(key, value):
                                val = str(path)
                                list = list + val[val.rfind("/") + 1:] + " "
                        print "        Services = [ %s]" % (list)
-               if "Providers" in properties.keys():
-                       list = ""
-                       for path in properties["Providers"]:
-                               val = str(path)
-                               list = list + val[val.rfind("/") + 1:] + " "
-                       print "        Providers = [ %s]" % (list)
 
 
 for key in properties.keys():
-       if key in ["Profiles", "Services", "Providers", "Technologies"]:
+       if key in ["Profiles", "Services", "Technologies"]:
                print_properties(key, properties[key])
        elif key in ["AvailableTechnologies", "EnabledTechnologies",
                                        "ConnectedTechnologies",