Fix network selection test scripts
authorMarcel Holtmann <marcel@holtmann.org>
Thu, 26 Mar 2009 08:22:44 +0000 (01:22 -0700)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 26 Mar 2009 08:22:44 +0000 (01:22 -0700)
test/connect-network
test/select-network

index 8f4f26b..37cf60b 100755 (executable)
@@ -22,7 +22,7 @@ for path in properties["Devices"]:
 
        if properties["Type"] not in ["wifi", "wimax",
                                        "bluetooth", "cellular"]:
-               continue;
+               continue
 
        for path in properties["Networks"]:
                network = dbus.Interface(bus.get_object("org.moblin.connman", path),
@@ -32,6 +32,9 @@ for path in properties["Devices"]:
 
                dev = path[path.rfind("/") + 1:]
 
+               if "Name" not in properties.keys():
+                       continue
+
                if dev == sys.argv[1] or properties["Name"] == sys.argv[1]:
                        print "Connecting %s" % (path)
                        network.Connect()
index e7c19be..376d9d2 100755 (executable)
@@ -21,7 +21,7 @@ for path in properties["Devices"]:
        properties = device.GetProperties()
 
        if (properties["Type"] != "wifi" and properties["Type"] != "wimax"):
-               continue;
+               continue
 
        print "[ %s ]" % (path)
 
@@ -31,7 +31,7 @@ for path in properties["Devices"]:
 
                properties = network.GetProperties()
 
-               if "Name" not in properties.keys:
+               if "Name" not in properties.keys():
                        continue
 
                if (properties["Connected"] == dbus.Boolean(1)):