Add test to select between identical SSID/different Auth

server/site_wlan_connect.py

 #!/usr/bin/python
 
 """Connect to a WiFi service and report the amount of time it took
 
 This script initiates a connection to a WiFi service and reports
 the time to major state changes (assoc, config).  If the connection
 fails within the desired time, it outputs the contents of the log
 files during that intervening time.
 
 """
@@ skipping 45 matching lines @@
 
     self.bus.add_signal_receiver(self.SupplicantChangeCallback,
                                  signal_name='PropertiesChanged',
                                  dbus_interface=SUPPLICANT+'.Interface')
 
   def FindService(self, path_list=None):
     service = None
     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)
           self.scan_timeout = None
         break
     else:
       if self.hidden:
         try:
           path = manager.GetService((self.connection_settings))
           service = dbus.Interface(
@@ skipping 178 matching lines @@
          (acquire_time, wpa_select_time, assoc_time, config_time,
           handler.frequency, handler.phymode, handler.security,
           str(connect_quirks.keys())))
 
   if connect_quirks:
     DumpLogs(logs)
   sys.exit(0)
 
 if __name__ == '__main__':
   main(sys.argv)