station: print which BSS is being connected to
PATCH 1/4 station: print which BSS is being connected to
For multi-bss networks its nice to know which BSS is being connected to. The ranking can hint at it, but blacklisting or network capabilities could effect which network is actually chosen. An explicit debug print makes debugging much easier.
--- src/station.c | 2 ++ 1 file changed, 2 insertions(+)
src/station.c +2 -0
@@ -2423,6 +2423,8 @@ int __station_connect_network(struct station *station, struct network *network,return r; } +l_debug ("connecting to BSS " MAC ,MAC_STR (bss->addr)); + station->connected_bss = bss; station->connected_network = network;
Signature · 1 line
2.26.2
PATCH 2/4 auto-t: don't clear out rules from hwsim object
This got added in the re-write but a __del__ method was also added to the Rule class as well. This caused problems if hwsim cleaned up since it removed the rules, which caused each rule to call __del__. Since the rule had already been removed there was no longer a DBus interface which raised an exception.
--- autotests/util/hwsim.py | 4 ---- 1 file changed, 4 deletions(-)
autotests/util/hwsim.py +0 -4
@@ -274,10 +274,6 @@ class Hwsim(iwd.AsyncOpAbstract): self._rules = RuleSet(self, objects) self._radios = RadioList(self, objects) - def __del__(self): - for rule in self._rules.values(): - rule.remove() - @property def rules(self): return self._rules
Signature · 1 line
2.26.2
PATCH 3/4 auto-t: fix testFT-PSK-roam
In reply to James PrestwoodSome cleanup code got removed by mistake which cleared out any hwsim rules before the next subtest. Without this the second test would end up getting erroneous signal strength numbers in the scan results causing a failure.
--- autotests/testFT-PSK-roam/connection_test.py | 5 +++++ 1 file changed, 5 insertions(+)
autotests/testFT-PSK-roam/connection_test.py +5 -0
@@ -187,6 +187,11 @@ class Test(unittest.TestCase): os.system('ifconfig "' + self.bss_hostapd[0].ifname + '" up') os.system('ifconfig "' + self.bss_hostapd[1].ifname + '" up') + hwsim = Hwsim() + + for rule in list(hwsim.rules.keys()): + del hwsim.rules[rule] + @classmethod def setUpClass(cls): hwsim = Hwsim()
Signature · 1 line
2.26.2
PATCH 4/4 auto-t: replace waiting for network with device
In reply to James PrestwoodMany tests waited on the network object 'connected' property after issuing a Connect command. This is not correct as 'connected' is set quite early in the connection process. The correct way of doing this is waiting for the device state to change to connected.
This common code was replaced, hopefully putting to rest any random failures that happen occasionally.
--- autotests/testAP/failure_test.py | 4 ++-- .../testAddressRandomization/connection_test.py | 4 ++-- autotests/testBSSBlacklist/bad_pass_test.py | 4 ++-- autotests/testBSSBlacklist/connection_test.py | 4 ++-- .../testClientNonInteractive/connect_command_test.py | 4 ++-- autotests/testConnectAutoconnect/validation.py | 4 ++-- autotests/testDisconnectOnConnect/connection_test.py | 8 ++++---- autotests/testEAP-AKA-ofono/connection_test.py | 4 ++-- autotests/testEAP-AKA-prime-ofono/connection_test.py | 4 ++-- autotests/testEAP-AKA-prime/connection_test.py | 4 ++-- autotests/testEAP-AKA/connection_test.py | 8 ++++---- autotests/testEAP-MSCHAPV2/connection_test.py | 4 ++-- autotests/testEAP-PEAP-GTC/peap_gtc_nosecret_test.py | 4 ++-- autotests/testEAP-PEAP-GTC/peap_gtc_test.py | 4 ++-- autotests/testEAP-PEAP-MSCHAPv2/connection_test.py | 4 ++-- autotests/testEAP-PEAP-SIM/connection_test.py | 4 ++-- autotests/testEAP-PEAP/peap_frag_test.py | 4 ++-- autotests/testEAP-PEAP/peap_v0_test.py | 4 ++-- autotests/testEAP-PEAP/peap_v1_test.py | 4 ++-- autotests/testEAP-PEAPv0-CryptoBinding/ISK_test.py | 4 ++-- autotests/testEAP-PEAPv0-CryptoBinding/NoISK_test.py | 8 ++++---- autotests/testEAP-PWD/connection_test.py | 8 ++++---- autotests/testEAP-PWD/frag_test.py | 4 ++-- autotests/testEAP-SIM-ofono/connection_test.py | 4 ++-- autotests/testEAP-SIM/connection_test.py | 8 ++++---- autotests/testEAP-TLS-Frag/connection_test.py | 4 ++-- .../testEAP-TLS-embedded-pems/connection_test.py | 4 ++-- autotests/testEAP-TLS/connection_test.py | 4 ++-- autotests/testEAP-TLSwithMFPC/connection_test.py | 4 ++-- autotests/testEAP-TLSwithMFPR/connection_test.py | 4 ++-- autotests/testEAP-TTLS-CHAP/connection_test.py | 8 ++++---- .../testEAP-TTLS-EAP-MSCHAPV2/connection_test.py | 4 ++-- autotests/testEAP-TTLS-Frag/connection_test.py | 4 ++-- autotests/testEAP-TTLS-MSCHAP/connection_test.py | 8 ++++---- autotests/testEAP-TTLS-MSCHAPv2/connection_test.py | 8 ++++---- autotests/testEAP-TTLS-PAP/connection_test.py | 8 ++++---- autotests/testEAP-TTLS/connection_test.py | 4 ++-- autotests/testFILS/fils_256_test.py | 8 ++++---- autotests/testFILS/fils_384_test.py | 8 ++++---- autotests/testFT-8021x-roam/connection_test.py | 12 +++++++----- autotests/testFT-FILS-SHA256/connection_test.py | 12 +++++++----- autotests/testFT-FILS-SHA384/connection_test.py | 8 ++++---- autotests/testFT-PSK-over-DS/connection_test.py | 4 ++-- autotests/testFT-PSK-roam/connection_test.py | 4 ++-- autotests/testFT-SAE-roam/connection_test.py | 4 ++-- autotests/testHT-VHT/connection_test.py | 7 ++----- autotests/testKnownNetworks/frequency_test.py | 4 ++-- autotests/testKnownNetworks/known_network_test.py | 4 ++-- autotests/testMFP-Options/connection_test.py | 4 ++-- autotests/testOWE/connection_test.py | 4 ++-- autotests/testOWE/renegotiate_test.py | 4 ++-- autotests/testOpen/connection_test.py | 4 ++-- autotests/testRRM/connection_test.py | 4 ++-- autotests/testRSSIAgent/connection_test.py | 4 ++-- autotests/testSAE/clogging_test.py | 6 +++--- autotests/testSAE/connection_test.py | 4 ++-- autotests/testSAE/group_20_connection_test.py | 4 ++-- autotests/testSAQuery-spoofing/connection_test.py | 8 ++++---- autotests/testSAQuery/connection_test.py | 4 ++-- autotests/testWPA/connection_test.py | 4 ++-- autotests/testWPA2-SHA256/connection_test.py | 4 ++-- autotests/testWPA2withMFP/connection_test.py | 4 ++-- 62 files changed, 161 insertions(+), 160 deletions(-)
autotests/testAP/failure_test.py +2 -2
@@ -25,8 +25,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(dev, condition) wd.unregister_psk_agent(psk_agent)
autotests/testAddressRandomization/connection_test.py +2 -2
@@ -24,8 +24,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected()
autotests/testBSSBlacklist/bad_pass_test.py +2 -2
@@ -77,8 +77,8 @@ class Test(unittest.TestCase): # successfully to bss_hostapd[0] self.assertIn(device.address, bss_hostapd[0].list_sta()) - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) wd.unregister_psk_agent(psk_agent)
autotests/testBSSBlacklist/connection_test.py +2 -2
@@ -134,8 +134,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) self.assertIn(device.address, bss_hostapd[0].list_sta())
autotests/testClientNonInteractive/connect_command_test.py +2 -2
@@ -20,8 +20,8 @@ class Test(unittest.TestCase): ordered_network = device.get_ordered_network(ssid) - condition = 'obj.connected' - self.wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + self.wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testConnectAutoconnect/validation.py +2 -2
@@ -24,8 +24,8 @@ class TestConnectAutoConnect(unittest.TestCase): else: ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) def check_autoconnect(self, wd, device, ssid, throws): if throws is None:
autotests/testDisconnectOnConnect/connection_test.py +4 -4
@@ -36,16 +36,16 @@ class Test(unittest.TestCase): wpa_net.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(wpa_net.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) open_net = device.get_ordered_network('ssidOpen') self.assertEqual(open_net.type, NetworkType.open) open_net.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(open_net.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) condition = 'obj.state == DeviceState.connected' wd.wait_for_object_condition(device, condition)
autotests/testEAP-AKA-ofono/connection_test.py +2 -2
@@ -46,8 +46,8 @@ class Test(unittest.TestCase): auth.stop() raise - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-AKA-prime-ofono/connection_test.py +2 -2
@@ -46,8 +46,8 @@ class Test(unittest.TestCase): auth.stop() raise - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-AKA-prime/connection_test.py +2 -2
@@ -40,8 +40,8 @@ class Test(unittest.TestCase): auth.stop() raise - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-AKA/connection_test.py +4 -4
@@ -46,16 +46,16 @@ class Test(unittest.TestCase): auth.stop() raise - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) hostapd.eapol_reauth(device.address) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED') hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS') - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-MSCHAPV2/connection_test.py +2 -2
@@ -38,8 +38,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) wd.unregister_psk_agent(psk_agent)
autotests/testEAP-PEAP-GTC/peap_gtc_nosecret_test.py +2 -2
@@ -35,8 +35,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-PEAP-GTC/peap_gtc_test.py +2 -2
@@ -34,8 +34,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-PEAP-MSCHAPv2/connection_test.py +2 -2
@@ -34,8 +34,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-PEAP-SIM/connection_test.py +2 -2
@@ -33,8 +33,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-PEAP/peap_frag_test.py +2 -2
@@ -33,8 +33,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-PEAP/peap_v0_test.py +2 -2
@@ -33,8 +33,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-PEAP/peap_v1_test.py +2 -2
@@ -33,8 +33,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-PEAPv0-CryptoBinding/ISK_test.py +2 -2
@@ -36,8 +36,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-PEAPv0-CryptoBinding/NoISK_test.py +4 -4
@@ -40,16 +40,16 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) hostapd.eapol_reauth(device.address) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED') hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS') - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected()
autotests/testEAP-PWD/connection_test.py +4 -4
@@ -43,16 +43,16 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) hostapd.eapol_reauth(device.address) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED') hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS') - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-PWD/frag_test.py +2 -2
@@ -32,8 +32,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-SIM-ofono/connection_test.py +2 -2
@@ -46,8 +46,8 @@ class Test(unittest.TestCase): auth.stop() raise - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-SIM/connection_test.py +4 -4
@@ -44,16 +44,16 @@ class Test(unittest.TestCase): auth.stop() raise - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) hostapd.eapol_reauth(device.address) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED') hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS') - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-TLS-Frag/connection_test.py +2 -2
@@ -33,8 +33,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-TLS-embedded-pems/connection_test.py +2 -2
@@ -43,8 +43,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected(hostapd.ifname, device.name)
autotests/testEAP-TLS/connection_test.py +2 -2
@@ -43,8 +43,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected(hapd.ifname, device.name)
autotests/testEAP-TLSwithMFPC/connection_test.py +2 -2
@@ -33,8 +33,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-TLSwithMFPR/connection_test.py +2 -2
@@ -33,8 +33,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-TTLS-CHAP/connection_test.py +4 -4
@@ -43,16 +43,16 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) hostapd.eapol_reauth(device.address) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED') hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS') - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected()
autotests/testEAP-TTLS-EAP-MSCHAPV2/connection_test.py +2 -2
@@ -40,8 +40,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected()
autotests/testEAP-TTLS-Frag/connection_test.py +2 -2
@@ -33,8 +33,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testEAP-TTLS-MSCHAP/connection_test.py +4 -4
@@ -43,16 +43,16 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) hostapd.eapol_reauth(device.address) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED') hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS') - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected()
autotests/testEAP-TTLS-MSCHAPv2/connection_test.py +4 -4
@@ -43,16 +43,16 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) hostapd.eapol_reauth(device.address) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED') hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS') - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected()
autotests/testEAP-TTLS-PAP/connection_test.py +4 -4
@@ -43,16 +43,16 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) hostapd.eapol_reauth(device.address) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED') hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS') - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected()
autotests/testEAP-TTLS/connection_test.py +2 -2
@@ -34,8 +34,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected()
autotests/testFILS/fils_256_test.py +4 -4
@@ -42,8 +42,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected(device.name, hapd.ifname)
@@ -62,8 +62,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected(device.name, hapd.ifname)
autotests/testFILS/fils_384_test.py +4 -4
@@ -42,8 +42,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected(device.name, hapd.ifname)
@@ -62,8 +62,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected(device.name, hapd.ifname)
autotests/testFT-8021x-roam/connection_test.py +7 -5
@@ -55,8 +55,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) self.assertTrue(self.bss_hostapd[0].list_sta()) self.assertFalse(self.bss_hostapd[1].list_sta())
@@ -82,7 +82,9 @@ class Test(unittest.TestCase): condition = 'obj.state != DeviceState.roaming' wd.wait_for_object_condition(device, condition) - self.assertEqual(device.state, iwd.DeviceState.connected) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) + self.assertTrue(self.bss_hostapd[1].list_sta()) testutil.test_iface_operstate(device.name)
@@ -132,8 +134,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) self.assertTrue(self.bss_hostapd[0].list_sta()) self.assertFalse(self.bss_hostapd[1].list_sta())
autotests/testFT-FILS-SHA256/connection_test.py +7 -5
@@ -60,8 +60,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) self.assertTrue(self.bss_hostapd[0].list_sta()) self.assertFalse(self.bss_hostapd[1].list_sta())
@@ -85,8 +85,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) self.assertTrue(self.bss_hostapd[0].list_sta()) self.assertFalse(self.bss_hostapd[1].list_sta())
@@ -112,7 +112,9 @@ class Test(unittest.TestCase): condition = 'obj.state != DeviceState.roaming' wd.wait_for_object_condition(device, condition) - self.assertEqual(device.state, iwd.DeviceState.connected) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) + self.assertTrue(self.bss_hostapd[1].list_sta()) testutil.test_iface_operstate(device.name)
autotests/testFT-FILS-SHA384/connection_test.py +4 -4
@@ -60,8 +60,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) self.assertTrue(self.bss_hostapd[0].list_sta()) self.assertFalse(self.bss_hostapd[1].list_sta())
@@ -85,8 +85,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) self.assertTrue(self.bss_hostapd[0].list_sta()) self.assertFalse(self.bss_hostapd[1].list_sta())
autotests/testFT-PSK-over-DS/connection_test.py +2 -2
@@ -59,8 +59,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) self.assertTrue(self.bss_hostapd[0].list_sta()) self.assertFalse(self.bss_hostapd[1].list_sta())
autotests/testFT-PSK-roam/connection_test.py +2 -2
@@ -145,8 +145,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) self.assertTrue(self.bss_hostapd[0].list_sta()) self.assertFalse(self.bss_hostapd[1].list_sta())
autotests/testFT-SAE-roam/connection_test.py +2 -2
@@ -65,8 +65,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) self.assertTrue(self.bss_hostapd[0].list_sta()) self.assertFalse(self.bss_hostapd[1].list_sta())
autotests/testHT-VHT/connection_test.py +2 -5
@@ -10,7 +10,6 @@ from iwd import PSKAgent from iwd import NetworkType from hwsim import Hwsim import testutil -from time import sleep from hostapd import HostapdCLI class Test(unittest.TestCase):
@@ -35,10 +34,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) - - sleep(1) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected(device.name, hostapd.ifname)
autotests/testKnownNetworks/frequency_test.py +2 -2
@@ -21,8 +21,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testKnownNetworks/known_network_test.py +2 -2
@@ -29,8 +29,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testMFP-Options/connection_test.py +2 -2
@@ -43,8 +43,8 @@ class TestMFP(unittest.TestCase): else: ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testOWE/connection_test.py +2 -2
@@ -37,8 +37,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected(device.name, hapd.ifname)
autotests/testOWE/renegotiate_test.py +2 -2
@@ -37,8 +37,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected(device.name, hapd.ifname)
autotests/testOpen/connection_test.py +2 -2
@@ -34,8 +34,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected()
autotests/testRRM/connection_test.py +2 -2
@@ -53,8 +53,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected()
autotests/testRSSIAgent/connection_test.py +2 -2
@@ -51,8 +51,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) # Test with 5 signal strength levels first, then with 3
autotests/testSAE/clogging_test.py +3 -3
@@ -43,9 +43,9 @@ class Test(unittest.TestCase): for n in networks: n.network_object.connect(wait=False) - for n in networks: - condition = 'obj.connected' - wd.wait_for_object_condition(n.network_object, condition) + for d in devices: + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(d, condition) for d in devices: condition = 'obj.state == DeviceState.connected'
autotests/testSAE/connection_test.py +2 -2
@@ -46,8 +46,8 @@ class Test(unittest.TestCase): network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) wd.wait(2)
autotests/testSAE/group_20_connection_test.py +2 -2
@@ -46,8 +46,8 @@ class Test(unittest.TestCase): network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) wd.wait(2)
autotests/testSAQuery-spoofing/connection_test.py +4 -4
@@ -46,8 +46,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) # TODO: for some reason hostapd does not respond to SA query if done # too soon after connection.
@@ -60,8 +60,8 @@ class Test(unittest.TestCase): sleep(4) # Since disassociate was spoofed we should still be connected - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testSAQuery/connection_test.py +2 -2
@@ -40,8 +40,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) # Make AP go down ungracefully, when hostapd comes back up it should # send an unprotected disassociate frame so the client will re-auth.
autotests/testWPA/connection_test.py +2 -2
@@ -38,8 +38,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) testutil.test_iface_operstate() testutil.test_ifaces_connected()
autotests/testWPA2-SHA256/connection_test.py +2 -2
@@ -37,8 +37,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
autotests/testWPA2withMFP/connection_test.py +2 -2
@@ -37,8 +37,8 @@ class Test(unittest.TestCase): ordered_network.network_object.connect() - condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) device.disconnect()
Signature · 1 line
2.26.2
Hi James,
Quoted 8 lines · James Prestwood
For multi-bss networks its nice to know which BSS is being connected to. The ranking can hint at it, but blacklisting or network capabilities could effect which network is actually chosen. An explicit debug print makes debugging much easier.
--- src/station.c | 2 ++ 1 file changed, 2 insertions(+)
All applied, thanks.
Regards,
-Denis