auto-t: update all tests to remove bad scanning logic

This changes all tests to use the default get_ordered_network behavior
rather than some custom or incorrect logic. Any use of
scan_if_needed=True has been removed since this is now the default.
Also any explicit scanning has been removed for tests which do not
require it (where the default behavior is good enough).

autotests/testAP/connection_test.py

@@ -15,7 +15,7 @@ class Test(unittest.TestCase):
     def client_connect(self, wd, dev):
         hostapd = HostapdCLI(config='psk-ccmp.conf')
 
-        ordered_network = dev.get_ordered_network('TestAP1', True)
+        ordered_network = dev.get_ordered_network('TestAP1')
 
         self.assertEqual(ordered_network.type, NetworkType.psk)
 

autotests/testAddressRandomization/connection_test.py

@@ -45,14 +45,6 @@ class Test(unittest.TestCase):
 
         perm_addr = device.address
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         # 1. Test per-network deterministic MAC generation
         os.system('cat pernetwork.psk > /tmp/iwd/ssidCCMP.psk')
         new_addr = self.try_connection(wd)

autotests/testAgent/agent_test.py

@@ -17,7 +17,7 @@ class Test(unittest.TestCase):
     def check_connection(self, wd, ssid):
 
         device = wd.list_devices(1)[0]
-        ordered_network = device.get_ordered_network(ssid, scan_if_needed=True)
+        ordered_network = device.get_ordered_network(ssid)
 
         ordered_network.network_object.connect()
 

autotests/testBSSBlacklist/all_blacklisted_test.py

@@ -47,7 +47,7 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        ordered_network = device.get_ordered_network("TestBlacklist", scan_if_needed=True)
+        ordered_network = device.get_ordered_network("TestBlacklist")
 
         self.assertEqual(ordered_network.type, NetworkType.psk)
 

autotests/testBSSBlacklist/bad_pass_test.py

@@ -47,7 +47,7 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        ordered_network = device.get_ordered_network("TestBlacklist", scan_if_needed=True)
+        ordered_network = device.get_ordered_network("TestBlacklist")
 
         self.assertEqual(ordered_network.type, NetworkType.psk)
 

autotests/testBSSBlacklist/connection_test.py

@@ -51,7 +51,7 @@ class Test(unittest.TestCase):
 
         devices[1].disconnect()
 
-        ordered_network = device.get_ordered_network("TestBlacklist", scan_if_needed=True)
+        ordered_network = device.get_ordered_network("TestBlacklist")
 
         self.assertEqual(ordered_network.type, NetworkType.psk)
 

autotests/testBSSBlacklist/temp_blacklist_test.py

@@ -46,7 +46,7 @@ class Test(unittest.TestCase):
 
         dev1, dev2 = wd.list_devices(2)
 
-        ordered_network = dev1.get_ordered_network("TestBlacklist", scan_if_needed=True)
+        ordered_network = dev1.get_ordered_network("TestBlacklist")
 
         self.assertEqual(ordered_network.type, NetworkType.psk)
 
@@ -63,14 +63,6 @@ class Test(unittest.TestCase):
         # dev1 now connected, this should max out the first AP, causing the next
         # connection to fail to this AP.
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(dev2, condition)
-
-        dev2.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(dev2, condition)
-
         ordered_network = dev2.get_ordered_network("TestBlacklist")
 
         self.assertEqual(ordered_network.type, NetworkType.psk)
@@ -92,14 +84,6 @@ class Test(unittest.TestCase):
         dev1.disconnect()
         dev2.disconnect()
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(dev2, condition)
-
-        dev2.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(dev2, condition)
-
         ordered_network = dev2.get_ordered_network("TestBlacklist")
 
         self.assertEqual(ordered_network.type, NetworkType.psk)

autotests/testClientNonInteractive/connect_command_test.py

@@ -98,6 +98,9 @@ class Test(unittest.TestCase):
 
         device.scan()
 
+        condition = 'obj.scanning'
+        cls.wd.wait_for_object_condition(device, condition)
+
         condition = 'not obj.scanning'
         cls.wd.wait_for_object_condition(device, condition)
 

autotests/testDisconnectOnConnect/connection_test.py

@@ -20,14 +20,6 @@ class Test(unittest.TestCase):
 
         device = wd.list_devices(1)[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         wpa_net = device.get_ordered_network('ssidTKIP')
         self.assertEqual(wpa_net.type, NetworkType.psk)
 

autotests/testEAP-AKA-ofono/connection_test.py

@@ -22,14 +22,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-AKA')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-AKA-prime-ofono/connection_test.py

@@ -22,14 +22,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-AKA')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-PEAP-GTC/peap_gtc_nosecret_test.py

@@ -18,14 +18,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-PEAPv1-GTC-nosecret')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-PEAP-GTC/peap_gtc_test.py

@@ -17,14 +17,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-PEAPv1-GTC')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-PEAP-MSCHAPv2/connection_test.py

@@ -17,14 +17,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-PEAP-MSCHAPv2')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-PEAP-SIM/connection_test.py

@@ -17,14 +17,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-PEAP-SIM')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-PEAP/peap_frag_test.py

@@ -16,14 +16,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-PEAP-frag')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-PEAP/peap_v0_test.py

@@ -16,14 +16,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-PEAPv0')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-PEAP/peap_v1_test.py

@@ -16,14 +16,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-PEAPv1')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-PEAPv0-CryptoBinding/ISK_test.py

@@ -19,14 +19,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-PEAPv0-ISK')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-PEAPv0-CryptoBinding/NoISK_test.py

@@ -23,14 +23,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-PEAPv0-NoISK')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-PWD/connection_test.py

@@ -26,14 +26,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-PWD')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-PWD/frag_test.py

@@ -15,14 +15,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-PWD-frag')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-SIM-ofono/connection_test.py

@@ -23,14 +23,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-SIM')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-TLS-Frag/connection_test.py

@@ -16,14 +16,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-TLS')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-TLS-embedded-pems/connection_test.py

@@ -24,16 +24,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        if not device.get_ordered_networks():
-            device.scan()
-            condition = 'obj.scanning'
-            wd.wait_for_object_condition(device, condition)
-            condition = 'not obj.scanning'
-            wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network(ssid)
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-TLS/connection_test.py

@@ -24,16 +24,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        if not device.get_ordered_networks():
-            device.scan()
-            condition = 'obj.scanning'
-            wd.wait_for_object_condition(device, condition)
-            condition = 'not obj.scanning'
-            wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network(ssid)
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-TLSwithMFPC/connection_test.py

@@ -16,14 +16,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-TLS')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-TLSwithMFPR/connection_test.py

@@ -16,14 +16,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-TLS')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-TTLS-CHAP/connection_test.py

@@ -26,14 +26,6 @@ class Test(unittest.TestCase):
 
         device = wd.list_devices(1)[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-TTLS-CHAP')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-TTLS-EAP-MSCHAPV2/connection_test.py

@@ -21,16 +21,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        if not device.get_ordered_networks():
-            device.scan()
-            condition = 'obj.scanning'
-            wd.wait_for_object_condition(device, condition)
-            condition = 'not obj.scanning'
-            wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-TTLS')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-TTLS-Frag/connection_test.py

@@ -16,14 +16,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-TTLS')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-TTLS-MSCHAP/connection_test.py

@@ -26,14 +26,6 @@ class Test(unittest.TestCase):
 
         device = wd.list_devices(1)[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-TTLS-MSCHAP')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-TTLS-MSCHAPv2/connection_test.py

@@ -24,16 +24,7 @@ class Test(unittest.TestCase):
 
         device = wd.list_devices(1)[0];
 
-        condition = 'not obj.scanning'
+        ordered_network = device.get_ordered_network('ssidEAP-TTLS-MSCHAPv2')
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        ordered_networks = device.get_ordered_networks()
-        ordered_network = ordered_networks[0]
 
         self.assertEqual(ordered_network.name, "ssidEAP-TTLS-MSCHAPv2")
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-TTLS-MSCHAPv2/failure_test.py

@@ -24,16 +24,7 @@ class Test(unittest.TestCase):
 
         device = wd.list_devices(1)[0];
 
-        condition = 'not obj.scanning'
+        ordered_network = device.get_ordered_network("ssidEAP-TTLS-MSCHAPv2")
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        ordered_networks = device.get_ordered_networks()
-        ordered_network = ordered_networks[0]
 
         self.assertEqual(ordered_network.name, "ssidEAP-TTLS-MSCHAPv2")
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-TTLS-PAP/connection_test.py

@@ -26,14 +26,6 @@ class Test(unittest.TestCase):
 
         device = wd.list_devices(1)[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-TTLS-PAP')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testEAP-TTLS/connection_test.py

@@ -17,14 +17,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidEAP-TTLS')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testFILS/fils_256_test.py

@@ -25,14 +25,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidFILS-256')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testFILS/fils_384_test.py

@@ -25,14 +25,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidFILS-384')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testFT-8021x-roam/connection_test.py

@@ -15,7 +15,7 @@ class Test(unittest.TestCase):
 
         device = wd.list_devices(1)[0]
 
-        ordered_network = device.get_ordered_network('TestFT', scan_if_needed=True)
+        ordered_network = device.get_ordered_network('TestFT')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)
 

autotests/testHT-VHT/connection_test.py

@@ -25,7 +25,11 @@ class Test(unittest.TestCase):
         condition = 'not obj.scanning'
         wd.wait_for_object_condition(device, condition)
 
-        ordered_network = device.get_ordered_network('testSSID')
+        #
+        # Scanning must be explicitly done to get updated RSSI values. Therefore
+        # scan_if_needed is set false because of the previous scan.
+        #
+        ordered_network = device.get_ordered_network('testSSID', scan_if_needed=False)
 
         self.assertEqual(ordered_network.type, NetworkType.psk)
 

autotests/testHiddenNetworks/connect_after_hidden_connect_test.py

@@ -33,8 +33,7 @@ class TestConnectionAfterHiddenNetwork(unittest.TestCase):
         wd.register_psk_agent(psk_agent)
 
         device = wd.list_devices(1)[0]
-        ordered_network = device.get_ordered_network('ssidOpen',
+        ordered_network = device.get_ordered_network('ssidOpen')
-                                                     scan_if_needed=True)
 
         device.connect_hidden_network_async(name='ssidSomeHidden',
                                                   reply_handler = self._success,

autotests/testHotspot/anqp_delay_test.py

@@ -44,7 +44,18 @@ class Test(unittest.TestCase):
         condition = 'not obj.scanning'
         wd.wait_for_object_condition(device, condition)
 
-        ordered_network = device.get_ordered_network('Hotspot')
+        # If no networks were found we likely had a quick scan. Try again to
+        # allow the full autoconnect scan to happen.
+        try:
+            ordered_network = device.get_ordered_network('Hotspot')
+        except:
+            condition = 'obj.scanning'
+            wd.wait_for_object_condition(device, condition)
+
+            condition = 'not obj.scanning'
+            wd.wait_for_object_condition(device, condition)
+
+            ordered_network = device.get_ordered_network('Hotspot')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)
 

autotests/testHotspot/hessid_test.py

@@ -25,14 +25,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('Hotspot')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testHotspot/hotspot_test.py

@@ -25,14 +25,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('Hotspot')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testHotspot/roaming_test.py

@@ -25,14 +25,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('Hotspot')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)

autotests/testKnownNetworks/frequency_test.py

@@ -38,14 +38,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         #
         # Connect to the PSK network, then Hotspot so IWD creates 2 entries in
         # the known frequency file.

autotests/testKnownNetworks/known_network_test.py

@@ -14,14 +14,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        device.scan()
-
-        condition = 'obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidNew')
 
         condition = 'not obj.connected'

autotests/testMFP-Options/connection_test.py

@@ -61,14 +61,6 @@ class TestMFP(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         if config_dir == '/tmp/IWD-MFP2':
             self.check_mfp_connection(wd, device, 'ssidMFP0', True)
         else:

autotests/testNetconfig/connection_test.py

@@ -24,14 +24,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidTKIP')
 
         self.assertEqual(ordered_network.type, NetworkType.psk)

autotests/testNetconfig/static_test.py

@@ -30,14 +30,6 @@ class Test(unittest.TestCase):
         dev1 = wd.list_devices(1)[0]
         dev2 = wd_ns0.list_devices(1)[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(dev1, condition)
-
-        dev1.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(dev1, condition)
-
         ordered_network = dev1.get_ordered_network('ssidTKIP')
 
         self.assertEqual(ordered_network.type, NetworkType.psk)

autotests/testOWE/connection_test.py

@@ -20,7 +20,7 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        device.get_ordered_network('ssidOWE', scan_if_needed=True)
+        device.get_ordered_network('ssidOWE')
 
         device.connect_bssid(hapd.bssid)
 
@@ -41,7 +41,7 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        device.get_ordered_network('ssidOWE', scan_if_needed=True)
+        device.get_ordered_network('ssidOWE')
 
         device.connect_bssid(hapd0.bssid)
 

autotests/testOWE/timeout_test.py

@@ -27,17 +27,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidOWE')
 
         self.assertEqual(ordered_network.type, NetworkType.open)

autotests/testOpen/connection_test.py

@@ -17,14 +17,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidOpen')
 
         self.assertEqual(ordered_network.type, NetworkType.open)

autotests/testPreauth-roam/connection_test.py

@@ -34,7 +34,7 @@ class Test(unittest.TestCase):
 
         device = wd.list_devices(1)[0]
 
-        ordered_network = device.get_ordered_network('TestPreauth', scan_if_needed=True)
+        ordered_network = device.get_ordered_network('TestPreauth')
 
         self.assertEqual(ordered_network.type, NetworkType.eap)
 

autotests/testRRM/connection_test.py

@@ -36,14 +36,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidRRM')
 
         self.assertEqual(ordered_network.type, NetworkType.psk)

autotests/testRoamRetry/fast_retry_test.py

@@ -61,14 +61,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('TestRoamRetry')
 
         self.assertEqual(ordered_network.type, NetworkType.psk)

autotests/testRoamRetry/stop_retry_test.py

@@ -60,14 +60,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('TestRoamRetry')
 
         self.assertEqual(ordered_network.type, NetworkType.psk)

autotests/testSAE/connection_test.py

@@ -30,7 +30,12 @@ class Test(unittest.TestCase):
         wd.wait_for_object_condition(device, 'obj.scanning')
         wd.wait_for_object_condition(device, 'not obj.scanning')
 
-        network = device.get_ordered_network('ssidSAE')
+        #
+        # An explicit scan was done prior due to hostapd options changing.
+        # Because of this scan_if_needed is set to False to avoid a redundant
+        # scan
+        #
+        network = device.get_ordered_network('ssidSAE', scan_if_needed=False)
 
         self.assertEqual(network.type, NetworkType.psk)
 

autotests/testSAE/failure_test.py

@@ -19,14 +19,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         network = device.get_ordered_network('ssidSAE')
 
         self.assertEqual(network.type, NetworkType.psk)

autotests/testSAE/timeout_test.py

@@ -23,14 +23,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         network = device.get_ordered_network('ssidSAE')
 
         self.assertEqual(network.type, NetworkType.psk)

autotests/testSAQuery-spoofing/connection_test.py

@@ -29,10 +29,7 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
+        ordered_network = device.get_ordered_network('ssidCCMP')
-        wd.wait_for_object_condition(device, condition)
-
-        ordered_network = device.get_ordered_network('ssidCCMP', scan_if_needed=True)
 
         self.assertEqual(ordered_network.type, NetworkType.psk)
 

autotests/testSAQuery/connection_test.py

@@ -23,14 +23,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidCCMP')
 
         self.assertEqual(ordered_network.type, NetworkType.psk)

autotests/testWPA/connection_test.py

@@ -21,14 +21,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidTKIP')
 
         self.assertEqual(ordered_network.type, NetworkType.psk)

autotests/testWPA2-SHA256/connection_test.py

@@ -20,14 +20,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidCCMP')
 
         self.assertEqual(ordered_network.type, NetworkType.psk)

autotests/testWPA2-no-CCMP/connection_test.py

@@ -21,14 +21,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidCCMP')
 
         self.assertEqual(ordered_network.type, NetworkType.psk)

autotests/testWPA2/connection_test.py

@@ -21,14 +21,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidCCMP')
 
         self.assertEqual(ordered_network.type, NetworkType.psk)

autotests/testWPA2/failure_test.py

@@ -22,14 +22,6 @@ class Test(unittest.TestCase):
         self.assertIsNotNone(devices)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidCCMP')
 
         self.assertEqual(ordered_network.type, NetworkType.psk)

autotests/testWPA2/password_test.py

@@ -22,16 +22,6 @@ class Test(unittest.TestCase):
         condition = 'obj.state == DeviceState.disconnected'
         wd.wait_for_object_condition(device, condition)
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        if not device.get_ordered_networks():
-            device.scan()
-            condition = 'obj.scanning'
-            wd.wait_for_object_condition(device, condition)
-            condition = 'not obj.scanning'
-            wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network("ssidCCMP")
         self.assertEqual(ordered_network.type, NetworkType.psk)
         network = ordered_network.network_object

autotests/testWPA2withMFP/connection_test.py

@@ -20,14 +20,6 @@ class Test(unittest.TestCase):
         devices = wd.list_devices(1)
         device = devices[0]
 
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
-        device.scan()
-
-        condition = 'not obj.scanning'
-        wd.wait_for_object_condition(device, condition)
-
         ordered_network = device.get_ordered_network('ssidCCMP')
 
         self.assertEqual(ordered_network.type, NetworkType.psk)