Add test to select between identical SSID/different Auth

server/site_wlan_connect.py

Index: server/site_wlan_connect.py
diff --git a/server/site_wlan_connect.py b/server/site_wlan_connect.py
index 4bcbec475cbaa716fdedb2a77b94608a9bc294c5..50c639f510c852886d697d2f86c61678bb2895d3 100644
--- a/server/site_wlan_connect.py
+++ b/server/site_wlan_connect.py
@@ -63,21 +63,24 @@ class ConnectStateHandler(StateHandler):
     for svc in FindObjects('Service', 'SSID', self.service_name,
                            path_list=path_list):
       props = svc.GetProperties()
+      set_props = {}
       for key, val in self.connection_settings.items():
         prop_val = convert_dbus_value(props.get(key))
         if key != 'SSID' and  prop_val != val:
           if key in ['Passphrase', 'SaveCredentials'] or key.startswith('EAP.'):
-            try:
-              svc.SetProperty(key, val)
-            except dbus.exceptions.DBusException, e:
-              self.failure = ('SetProperty: DBus exception %s for set of %s' %
-                              (e, key))
-              return None
+            set_props[key] = val
           else:
             self.Debug('Service key mismatch: %s %s != %s' %
                        (key, val, str(prop_val)))
             break
       else:
+        for key, val in set_props.iteritems():
+          try:
+            svc.SetProperty(key, val)
+          except dbus.exceptions.DBusException, e:
+            self.failure = ('SetProperty: DBus exception %s for set of %s' %
+                            (e, key))
+            return None
         service = svc
         if self.scan_timeout is not None:
           gobject.source_remove(self.scan_timeout)