station: make autoconnect settable via debug interface
PATCH 1/7 station: make autoconnect settable via debug interface
This adds the property "AutoConnect" to the station debug interface which can be read/written to disable or enable autoconnect globally. As one would expect this property is only going to be used for testing hence why it was put on the debug interface. Mosts tests disable autoconnect (or they should) because it leads to unexpected connections.
--- src/station.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
src/station.c +44 -0
@@ -1211,6 +1211,11 @@ bool station_set_autoconnect(struct station *station, bool autoconnect)if (station_is_autoconnecting (station) && !autoconnect)station_enter_state (station,STATION_STATE_DISCONNECTED ); +if (iwd_is_developer_mode ()) +l_dbus_property_changed (dbus_get_bus (), +netdev_get_path (station->netdev), +IWD_STATION_DEBUG_INTERFACE ,"AutoConnect" ); +return true; }
@@ -3831,6 +3836,41 @@ invalid_args:return dbus_error_invalid_args (message); } +static bool station_property_get_autoconnect (struct l_dbus *dbus, +struct l_dbus_message *message, +struct l_dbus_message_builder *builder, +void *user_data) +{ +struct station *station = user_data; +bool autoconnect; + + autoconnect = station->autoconnect; + +l_dbus_message_builder_append_basic (builder,'b' , &autoconnect); + +return true; +} + +static struct l_dbus_message *station_property_set_autoconnect ( +struct l_dbus *dbus, +struct l_dbus_message *message, +struct l_dbus_message_iter *new_value, +l_dbus_property_complete_cb_t complete, +void *user_data) +{ +struct station *station = user_data; +bool autoconnect; + +if (!l_dbus_message_iter_get_variant (new_value,"b" , &autoconnect)) +return dbus_error_invalid_args (message); + +l_debug ("Setting autoconnect %s" , autoconnect ?"true" :"false" ); + +station_set_autoconnect (station, autoconnect); + +return l_dbus_message_new_method_return (message); +} +static void station_setup_debug_interface (struct l_dbus_interface *interface) {
@@ -3839,6 +3879,10 @@ static void station_setup_debug_interface( "mac");l_dbus_interface_method (interface,"Roam" ,0 , station_force_roam,"" ,"ay" ,"mac" ); + +l_dbus_interface_property (interface,"AutoConnect" ,0 ,"b" , + station_property_get_autoconnect, + station_property_set_autoconnect); } static void ap_roam_frame_event(const struct mmpdu_header *hdr,
Signature · 1 line
2.31.1
PATCH 2/7 station: disable autoconnect when in developer mode
Most autotests do not want autoconnect behavior so it is being turned off by default. There are a few tests where it is needed and in these few cases the test can enable autoconnect through the new station debug property.
--- src/station.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
src/station.c +6 -3
@@ -3507,6 +3507,7 @@ static struct station *station_create(struct netdev *netdev) {struct station *station;struct l_dbus *dbus =dbus_get_bus (); +bool autoconnect = true; station = l_new(struct station, 1);watchlist_init (&station->state_watches,NULL );
@@ -3524,8 +3525,6 @@ static struct station *station_create(struct netdev *netdev)l_queue_push_head (station_list, station); -station_set_autoconnect (station, true); -l_dbus_object_add_interface (dbus,netdev_get_path (netdev),IWD_STATION_INTERFACE , station);
@@ -3536,11 +3535,15 @@ static struct station *station_create(struct netdev *netdev)station_fill_scan_freq_subsets (station); -if (iwd_is_developer_mode ()) +if (iwd_is_developer_mode ()) {l_dbus_object_add_interface (dbus,netdev_get_path (station->netdev),IWD_STATION_DEBUG_INTERFACE , station); + autoconnect = false; + } + +station_set_autoconnect (station, autoconnect);return station; }
Signature · 1 line
2.31.1
PATCH 3/7 auto-t: iwd.py: add autoconnect property/StationDebug
In reply to James Prestwood--- autotests/util/iwd.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
autotests/util/iwd.py +31 -0
@@ -226,6 +226,21 @@ class AdHocDevice(IWDDBusAbstract): def connected_peers(self): return self._properties['ConnectedPeers'] +class StationDebug(IWDDBusAbstract): + ''' + Class represents net.connman.iwd.StationDebug + ''' + _iface_name = IWD_STATION_DEBUG_INTERFACE + + def __init__(self, *args, **kwargs): + self._debug_props = None + self._debug_iface = None + + IWDDBusAbstract.__init__(self, *args, **kwargs) + + @property + def autoconnect(self): + return self._properties['AutoConnect'] class Device(IWDDBusAbstract): '''
@@ -238,6 +253,7 @@ class Device(IWDDBusAbstract): self._wps_manager_if = None self._station_if = None self._station_props = None + self._station_debug = None IWDDBusAbstract.__init__(self, *args, **kwargs) @property
@@ -354,6 +370,21 @@ class Device(IWDDBusAbstract): props = self._station_properties() return bool(props['Scanning']) + @property + def autoconnect(self): + if not self._station_debug: + self._station_debug = StationDebug(self._object_path) + + return self._station_debug.autoconnect + + @autoconnect.setter + def autoconnect(self, value): + if not self._station_debug: + self._station_debug = StationDebug(self._object_path) + + self._station_debug._prop_proxy.Set(IWD_STATION_DEBUG_INTERFACE, + 'AutoConnect', value) + def scan(self): '''Schedule a network scan.
Signature · 1 line
2.31.1
PATCH 4/7 auto-t: iwd.py: make scan_if_needed True by default
In reply to James PrestwoodThere is a common block of code in nearly every test which is incorrect, most likely a copy-paste from long ago. It goes something like:
wd.wait_for_object_condition(device, 'not obj.scanning') device.scan() wd.wait_for_object_condition(device, 'not obj.scanning')
network = device.get_ordered_network("ssid")
The problem here is that sometimes the scanning property does not get updated fast enough before device.scan() returns, meaning get_ordered_network comes up with nothing. Some tests pass scan_if_needed=True which 'fixes' this but ends up re-scanning after the original scan finishes.
To put this to rest scan_if_needed is now defaulted to True, and no explicit scan should be needed.
--- autotests/util/iwd.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
autotests/util/iwd.py +9 -3
@@ -410,7 +410,7 @@ class Device(IWDDBusAbstract): self._wait_for_async_op() - def get_ordered_networks(self, scan_if_needed = False): + def get_ordered_networks(self, scan_if_needed = True): '''Return the list of networks found in the most recent scan, sorted by their user interface importance score as calculated by iwd. If the device is
@@ -432,7 +432,13 @@ class Device(IWDDBusAbstract): elif not scan_if_needed: return None - self.scan() + condition = 'not obj.scanning' + IWD._wait_for_object_condition(self, condition) + + try: + self.scan() + except InProgressEx: + pass condition = 'obj.scanning' IWD._wait_for_object_condition(self, condition)
@@ -448,7 +454,7 @@ class Device(IWDDBusAbstract): return None - def get_ordered_network(self, network, scan_if_needed = False): + def get_ordered_network(self, network, scan_if_needed = True): '''Returns a single network from ordered network call, or None if the network wasn't found. If the network is not found an exception is raised, this removes the need to extra asserts in autotests.
Signature · 1 line
2.31.1
PATCH 5/7 auto-t: make hwsim registration off by default
In reply to James PrestwoodWith the addition of connect_bssid/roam very few tests actually require hwsim. Since hwsim can lead to problems with scan results its best to have it off by default and have each test that needs it explicitly turn it on.
Tests which previously turned it off have had that option removed.
Tests that do require hwsim still are vulnerable to scan result problems, so for these tests beacon_int was added to the hostapd config which seems to help with reliability somewhat.
--- autotests/testAP/hw.conf | 1 - autotests/testBSSBlacklist/hw.conf | 1 + autotests/testBSSBlacklist/ssid1.conf | 1 + autotests/testBSSBlacklist/ssid2.conf | 1 + autotests/testBSSBlacklist/ssid3.conf | 3 ++- autotests/testFT-FILS/hw.conf | 1 + autotests/testHT-VHT/ht.conf | 1 + autotests/testHT-VHT/hw.conf | 1 + autotests/testHT-VHT/non-ht-vht.conf | 1 + autotests/testHT-VHT/vht.conf | 1 + autotests/testHiddenNetworks/hw.conf | 1 - autotests/testHotspot/hw.conf | 1 + autotests/testHotspot/ssidHotspot.conf | 1 + autotests/testHotspot/ssidHotspotUnconfigured.conf | 1 + autotests/testHotspot/ssidWPA2-1.conf | 1 + autotests/testHotspot/ssidWPA2-2.conf | 1 + autotests/testHotspot/ssidWPA2-3.conf | 1 + autotests/testKnownNetworks/ssidCCMP-2G.conf | 1 + autotests/testKnownNetworks/ssidCCMP-5G.conf | 1 + autotests/testKnownNetworks/ssidHotspot.conf | 1 + autotests/testNetconfig/hw.conf | 1 - autotests/testOWE/hw.conf | 1 + autotests/testP2P/hw.conf | 1 - autotests/testPSK-roam/hw.conf | 1 + autotests/testRSSIAgent/hw.conf | 1 + autotests/testRoamRetry/hw.conf | 1 + autotests/testRoamRetry/ssid1.conf | 1 + autotests/testRoamRetry/ssid2.conf | 1 + autotests/testSAE/hw.conf | 1 + autotests/testSAQuery-spoofing/hw.conf | 1 + autotests/testSAQuery-spoofing/ssidCCMP.conf | 1 + tools/test-runner | 2 +- 32 files changed, 29 insertions(+), 6 deletions(-)
autotests/testAP/hw.conf +0 -1
@@ -1,7 +1,6 @@ [SETUP] num_radios=6 start_iwd=0 -hwsim_medium=no [HOSTAPD] rad0=psk-ccmp.conf
autotests/testBSSBlacklist/hw.conf +1 -0
@@ -1,6 +1,7 @@ [SETUP] num_radios=5 start_iwd=0 +hwsim_medium=yes [HOSTAPD] rad0=ssid1.conf
autotests/testBSSBlacklist/ssid1.conf +1 -0
@@ -9,3 +9,4 @@ wpa_passphrase=secret123 ctrl_interface=/var/run/hostapd rrm_neighbor_report=1 +beacon_int=10
autotests/testBSSBlacklist/ssid2.conf +1 -0
@@ -9,3 +9,4 @@ wpa_passphrase=secret123 ctrl_interface=/var/run/hostapd rrm_neighbor_report=1 +beacon_int=10
autotests/testBSSBlacklist/ssid3.conf +2 -1
@@ -9,4 +9,5 @@ wpa_passphrase=secret123 ctrl_interface=/var/run/hostapd rrm_neighbor_report=1 -max_num_sta=1 +max_num_sta=1 +beacon_int=10
autotests/testFT-FILS/hw.conf +1 -0
@@ -1,6 +1,7 @@ [SETUP] num_radios=3 start_iwd=0 +hwsim_medium=yes [HOSTAPD] rad0=ft-eap-ccmp-1.conf
autotests/testHT-VHT/ht.conf +1 -0
@@ -9,3 +9,4 @@ wpa_passphrase=secret123 ieee80211n=1 channel=36 +beacon_int=10
autotests/testHT-VHT/hw.conf +1 -0
@@ -1,6 +1,7 @@ [SETUP] num_radios=4 reg_domain=US +hwsim_medium=yes [HOSTAPD] rad0=non-ht-vht.conf
autotests/testHT-VHT/non-ht-vht.conf +1 -0
@@ -6,3 +6,4 @@ ssid=testSSID wpa=2 wpa_pairwise=CCMP wpa_passphrase=secret123 +beacon_int=10
autotests/testHT-VHT/vht.conf +1 -0
@@ -12,3 +12,4 @@ ieee80211n=1 ieee80211ac=1 channel=36 +beacon_int=10
autotests/testHiddenNetworks/hw.conf +0 -1
@@ -1,7 +1,6 @@ [SETUP] num_radios=7 start_iwd=0 -hwsim_medium=no [HOSTAPD] rad0=ssidHiddenOpen.conf
autotests/testHotspot/hw.conf +1 -0
@@ -1,6 +1,7 @@ [SETUP] num_radios=6 start_iwd=0 +hwsim_medium=yes [HOSTAPD] rad0=ssidHotspot.conf
autotests/testHotspot/ssidHotspot.conf +1 -0
@@ -44,3 +44,4 @@ eap_user_file=/tmp/eap_users.text ca_cert=/tmp/certs/cert-ca.pem server_cert=/tmp/certs/cert-server.pem private_key=/tmp/certs/cert-server-key.pem +beacon_int=10
autotests/testHotspot/ssidHotspotUnconfigured.conf +1 -0
@@ -44,3 +44,4 @@ eap_user_file=/tmp/eap_users.text ca_cert=/tmp/certs/cert-ca.pem server_cert=/tmp/certs/cert-server.pem private_key=/tmp/certs/cert-server-key.pem +beacon_int=10
autotests/testHotspot/ssidWPA2-1.conf +1 -0
@@ -6,3 +6,4 @@ ssid=ssidWPA2-1 wpa=2 wpa_pairwise=CCMP wpa_passphrase=secret123 +beacon_int=10
autotests/testHotspot/ssidWPA2-2.conf +1 -0
@@ -6,3 +6,4 @@ ssid=ssidWPA2-2 wpa=2 wpa_pairwise=CCMP wpa_passphrase=secret123 +beacon_int=10
autotests/testHotspot/ssidWPA2-3.conf +1 -0
@@ -6,3 +6,4 @@ ssid=ssidWPA2-3 wpa=2 wpa_pairwise=CCMP wpa_passphrase=secret123 +beacon_int=10
autotests/testKnownNetworks/ssidCCMP-2G.conf +1 -0
@@ -5,3 +5,4 @@ ssid=ssidCCMP wpa=2 wpa_pairwise=CCMP wpa_passphrase=secret123 +beacon_int=10
autotests/testKnownNetworks/ssidCCMP-5G.conf +1 -0
@@ -6,3 +6,4 @@ country_code=US wpa=2 wpa_pairwise=CCMP wpa_passphrase=secret123 +beacon_int=10
autotests/testKnownNetworks/ssidHotspot.conf +1 -0
@@ -44,3 +44,4 @@ eap_user_file=/tmp/eap_users.text ca_cert=/tmp/certs/cert-ca.pem server_cert=/tmp/certs/cert-server.pem private_key=/tmp/certs/cert-server-key.pem +beacon_int=10
autotests/testNetconfig/hw.conf +0 -1
@@ -1,7 +1,6 @@ [SETUP] num_radios=3 start_iwd=0 -hwsim_medium=no [HOSTAPD] rad0=ssidTKIP.conf
autotests/testOWE/hw.conf +1 -0
@@ -1,5 +1,6 @@ [SETUP] num_radios=4 +hwsim_medium=yes [HOSTAPD] rad0=ssidOWE-1.conf
autotests/testP2P/hw.conf +0 -1
@@ -1,6 +1,5 @@ [SETUP] num_radios=2 -hwsim_medium=no [WPA_SUPPLICANT] rad1=rad1-p2p.conf
autotests/testPSK-roam/hw.conf +1 -0
@@ -1,6 +1,7 @@ [SETUP] num_radios=3 start_iwd=0 +hwsim_medium=yes [HOSTAPD] rad0=ft-psk-ccmp-1.conf
autotests/testRSSIAgent/hw.conf +1 -0
@@ -1,5 +1,6 @@ [SETUP] num_radios=2 +hwsim_medium=yes [HOSTAPD] rad0=open.conf
autotests/testRoamRetry/hw.conf +1 -0
@@ -1,5 +1,6 @@ [SETUP] num_radios=3 +hwsim_medium=yes [HOSTAPD] rad0=ssid1.conf
autotests/testRoamRetry/ssid1.conf +1 -0
@@ -9,3 +9,4 @@ wpa_passphrase=secret123 ctrl_interface=/var/run/hostapd rrm_neighbor_report=1 +beacon_int=10
autotests/testRoamRetry/ssid2.conf +1 -0
@@ -9,3 +9,4 @@ wpa_passphrase=secret123 ctrl_interface=/var/run/hostapd rrm_neighbor_report=1 +beacon_int=10
autotests/testSAE/hw.conf +1 -0
@@ -1,6 +1,7 @@ [SETUP] num_radios=2 start_iwd=0 +hwsim_medium=yes [HOSTAPD] rad0=ssidSAE.conf
autotests/testSAQuery-spoofing/hw.conf +1 -0
@@ -1,5 +1,6 @@ [SETUP] num_radios=2 +hwsim_medium=yes [HOSTAPD] rad0=ssidCCMP.conf
autotests/testSAQuery-spoofing/ssidCCMP.conf +1 -0
@@ -8,3 +8,4 @@ wpa_passphrase=secret123 ieee80211w=2 wpa_key_mgmt=WPA-PSK-SHA256 +beacon_int=10
tools/test-runner +1 -1
@@ -755,7 +755,7 @@ class TestContext(Namespace): nradios = int(setup['num_radios']) args = ['hwsim'] - if not self.hw_config['SETUP'].get('hwsim_medium', 'yes') in ['yes', '1', 'true']: + if self.hw_config['SETUP'].get('hwsim_medium', 'no') in ['no', '0', 'false']: # register hwsim as medium args.extend(['--no-register'])
Signature · 1 line
2.31.1
PATCH 6/7 auto-t: update all tests to remove bad scanning logic
In reply to James PrestwoodThis 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 | 2 +- .../connection_test.py | 8 -------- autotests/testAgent/agent_test.py | 2 +- .../testBSSBlacklist/all_blacklisted_test.py | 2 +- autotests/testBSSBlacklist/bad_pass_test.py | 2 +- autotests/testBSSBlacklist/connection_test.py | 2 +- .../testBSSBlacklist/temp_blacklist_test.py | 18 +----------------- .../connect_command_test.py | 3 +++ .../testDisconnectOnConnect/connection_test.py | 8 -------- autotests/testEAP-AKA-ofono/connection_test.py | 8 -------- .../testEAP-AKA-prime-ofono/connection_test.py | 8 -------- .../testEAP-PEAP-GTC/peap_gtc_nosecret_test.py | 8 -------- autotests/testEAP-PEAP-GTC/peap_gtc_test.py | 8 -------- .../testEAP-PEAP-MSCHAPv2/connection_test.py | 8 -------- autotests/testEAP-PEAP-SIM/connection_test.py | 8 -------- autotests/testEAP-PEAP/peap_frag_test.py | 8 -------- autotests/testEAP-PEAP/peap_v0_test.py | 8 -------- autotests/testEAP-PEAP/peap_v1_test.py | 8 -------- .../testEAP-PEAPv0-CryptoBinding/ISK_test.py | 8 -------- .../testEAP-PEAPv0-CryptoBinding/NoISK_test.py | 8 -------- autotests/testEAP-PWD/connection_test.py | 8 -------- autotests/testEAP-PWD/frag_test.py | 8 -------- autotests/testEAP-SIM-ofono/connection_test.py | 8 -------- autotests/testEAP-TLS-Frag/connection_test.py | 8 -------- .../connection_test.py | 10 ---------- autotests/testEAP-TLS/connection_test.py | 10 ---------- .../testEAP-TLSwithMFPC/connection_test.py | 8 -------- .../testEAP-TLSwithMFPR/connection_test.py | 8 -------- autotests/testEAP-TTLS-CHAP/connection_test.py | 8 -------- .../connection_test.py | 10 ---------- autotests/testEAP-TTLS-Frag/connection_test.py | 8 -------- .../testEAP-TTLS-MSCHAP/connection_test.py | 8 -------- .../testEAP-TTLS-MSCHAPv2/connection_test.py | 11 +---------- .../testEAP-TTLS-MSCHAPv2/failure_test.py | 11 +---------- autotests/testEAP-TTLS-PAP/connection_test.py | 8 -------- autotests/testEAP-TTLS/connection_test.py | 8 -------- autotests/testFILS/fils_256_test.py | 8 -------- autotests/testFILS/fils_384_test.py | 8 -------- autotests/testFT-8021x-roam/connection_test.py | 2 +- autotests/testHT-VHT/connection_test.py | 6 +++++- .../connect_after_hidden_connect_test.py | 3 +-- autotests/testHotspot/anqp_delay_test.py | 13 ++++++++++++- autotests/testHotspot/hessid_test.py | 8 -------- autotests/testHotspot/hotspot_test.py | 8 -------- autotests/testHotspot/roaming_test.py | 8 -------- autotests/testKnownNetworks/frequency_test.py | 8 -------- .../testKnownNetworks/known_network_test.py | 8 -------- autotests/testMFP-Options/connection_test.py | 8 -------- autotests/testNetconfig/connection_test.py | 8 -------- autotests/testNetconfig/static_test.py | 8 -------- autotests/testOWE/connection_test.py | 4 ++-- autotests/testOWE/timeout_test.py | 11 ----------- autotests/testOpen/connection_test.py | 8 -------- autotests/testPreauth-roam/connection_test.py | 2 +- autotests/testRRM/connection_test.py | 8 -------- autotests/testRoamRetry/fast_retry_test.py | 8 -------- autotests/testRoamRetry/stop_retry_test.py | 8 -------- autotests/testSAE/connection_test.py | 7 ++++++- autotests/testSAE/failure_test.py | 8 -------- autotests/testSAE/timeout_test.py | 8 -------- .../testSAQuery-spoofing/connection_test.py | 5 +---- autotests/testSAQuery/connection_test.py | 8 -------- autotests/testWPA/connection_test.py | 8 -------- autotests/testWPA2-SHA256/connection_test.py | 8 -------- autotests/testWPA2-no-CCMP/connection_test.py | 8 -------- autotests/testWPA2/connection_test.py | 8 -------- autotests/testWPA2/failure_test.py | 8 -------- autotests/testWPA2/password_test.py | 10 ---------- autotests/testWPA2withMFP/connection_test.py | 8 -------- 69 files changed, 40 insertions(+), 482 deletions(-)
autotests/testAP/connection_test.py +1 -1
@@ -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 +0 -8
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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 +1 -1
@@ -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 +1 -17
@@ -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 +3 -0
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -10
@@ -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 +0 -10
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -10
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +1 -10
@@ -24,16 +24,7 @@ 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_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-TTLS-MSCHAPv2') self.assertEqual(ordered_network.name, "ssidEAP-TTLS-MSCHAPv2") self.assertEqual(ordered_network.type, NetworkType.eap)
autotests/testEAP-TTLS-MSCHAPv2/failure_test.py +1 -10
@@ -24,16 +24,7 @@ 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_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network("ssidEAP-TTLS-MSCHAPv2") self.assertEqual(ordered_network.name, "ssidEAP-TTLS-MSCHAPv2") self.assertEqual(ordered_network.type, NetworkType.eap)
autotests/testEAP-TTLS-PAP/connection_test.py +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +1 -1
@@ -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 +5 -1
@@ -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 +1 -2
@@ -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', - scan_if_needed=True) + ordered_network = device.get_ordered_network('ssidOpen') device.connect_hidden_network_async(name='ssidSomeHidden', reply_handler = self._success,
autotests/testHotspot/anqp_delay_test.py +12 -1
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +2 -2
@@ -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 +0 -11
@@ -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 +0 -8
@@ -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 +1 -1
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +6 -1
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +1 -4
@@ -29,10 +29,7 @@ class Test(unittest.TestCase): devices = wd.list_devices(1) device = devices[0] - condition = 'not obj.scanning' - wd.wait_for_object_condition(device, condition) - - ordered_network = device.get_ordered_network('ssidCCMP', scan_if_needed=True) + ordered_network = device.get_ordered_network('ssidCCMP') self.assertEqual(ordered_network.type, NetworkType.psk)
autotests/testSAQuery/connection_test.py +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -8
@@ -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 +0 -10
@@ -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 +0 -8
@@ -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)
Signature · 1 line
2.31.1
PATCH 7/7 auto-t: set autoconnect=True for tests that need it
In reply to James PrestwoodAfter the default behavior was changed to disable autoconnect there were several tests which still needed it to be turned on.
--- autotests/testBSSBlacklist/connection_test.py | 6 ++---- autotests/testConnectAutoconnect/validation.py | 2 ++ autotests/testHiddenNetworks/validation.py | 2 ++ autotests/testHotspot/anqp_delay_test.py | 1 + autotests/testHotspot/autoconnect_test.py | 1 + autotests/testSAE/autoconnect_test.py | 1 + autotests/testScan/periodic_scan_test.py | 1 + autotests/testScan/requested_scan_test.py | 1 + autotests/testScanKnownFreqs/quick_scan_test.py | 1 + 9 files changed, 12 insertions(+), 4 deletions(-)
autotests/testBSSBlacklist/connection_test.py +2 -4
@@ -81,10 +81,8 @@ class Test(unittest.TestCase): rule0.drop = False - # Next try autoconnecting to a network with a blacklisted BSS. Since an - # explicit disconnect call would disable autoconnect we reset - # hostapd which will disconnect IWD. - bss_hostapd[1].reload() + device.disconnect() + device.autoconnect = True condition = 'not obj.connected' wd.wait_for_object_condition(ordered_network.network_object, condition)
autotests/testConnectAutoconnect/validation.py +2 -0
@@ -28,6 +28,8 @@ class TestConnectAutoConnect(unittest.TestCase): wd.wait_for_object_condition(device, condition) def check_autoconnect(self, wd, device, ssid, throws): + device.autoconnect = True + if throws is None: condition = 'obj.state == DeviceState.connected' wd.wait_for_object_condition(device, condition)
autotests/testHiddenNetworks/validation.py +2 -0
@@ -48,11 +48,13 @@ class TestConnectAutoConnect(unittest.TestCase): devices = wd.list_devices(1) self.assertIsNotNone(devices) device = devices[0] + device.autoconnect = autoconnect if autoconnect: self.check_autoconnect_hidden_network(wd, device, ssid, throws) else: if wait_periodic_scan: + device.autoconnect = True condition = 'obj.scanning' wd.wait_for_object_condition(device, condition) condition = 'not obj.scanning'
autotests/testHotspot/anqp_delay_test.py +1 -0
@@ -33,6 +33,7 @@ class Test(unittest.TestCase): devices = wd.list_devices(1) device = devices[0] + device.autoconnect = True # We are dependent on a periodic scan here. We want to wait for this # because this is the first opportunity IWD has to do ANQP. Once ANQP
autotests/testHotspot/autoconnect_test.py +1 -0
@@ -23,6 +23,7 @@ class Test(unittest.TestCase): devices = wd.list_devices(1) device = devices[0] + device.autoconnect = True condition = 'obj.scanning' wd.wait_for_object_condition(device, condition)
autotests/testSAE/autoconnect_test.py +1 -0
@@ -17,6 +17,7 @@ class Test(unittest.TestCase): devices = wd.list_devices(1) self.assertIsNotNone(devices) device = devices[0] + device.autoconnect = True condition = 'obj.state == DeviceState.connected' wd.wait_for_object_condition(device, condition)
autotests/testScan/periodic_scan_test.py +1 -0
@@ -28,6 +28,7 @@ class Test(unittest.TestCase): devices = wd.list_devices(1) self.assertIsNotNone(devices) device = devices[0] + device.autoconnect = True # Device initiates a passive periodic scan. condition = 'obj.scanning'
autotests/testScan/requested_scan_test.py +1 -0
@@ -30,6 +30,7 @@ class Test(unittest.TestCase): devices = wd.list_devices(1) self.assertIsNotNone(devices) device = devices[0] + device.autoconnect = True condition = 'obj.scanning' wd.wait_for_object_condition(device, condition)
autotests/testScanKnownFreqs/quick_scan_test.py +1 -0
@@ -24,6 +24,7 @@ class Test(unittest.TestCase): def validate_quick_scan(self, wd): devices = wd.list_devices(1) device = devices[0] + device.autoconnect = True # Device initiates a passive quick scan and scans only for the known # frequencies (listed in .known_network.freq file).
Signature · 1 line
2.31.1
Hi James,
Quoted 9 lines · James Prestwood
This adds the property "AutoConnect" to the station debug interface which can be read/written to disable or enable autoconnect globally. As one would expect this property is only going to be used for testing hence why it was put on the debug interface. Mosts tests disable autoconnect (or they should) because it leads to unexpected connections.
--- src/station.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
All applied, thanks.
Regards,
-Denis