Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-25 17:59:25 +01:00
Code Releases Activity

auto-t: update roaming tests with wait_for_object_change

Browse Source 
Every single roaming test had one of two problems with watching the
state change between roaming --> connected. Either the test used
wait_for_object_condition to wait for 'connected' which could allow
other states in between. Or it simply used an assert. The assert
wouldn't allow other state changes, but at the cost of potentially
failing due to IWD not having made it to the 'connected' state yet.

Now we have wait_for_object_change which takes two conditions:
initial (from_str) and expected (to_str). This API will not allow
any other conditions except these, and will wait for the expected
condition before continuing. This allows roaming test to reliably
wait for the roaming --> connected state change.
This commit is contained in:
James Prestwood 2021-02-05 11:06:37 -08:00 committed by Denis Kenzior
parent c5538f6450
commit 1dc4d6e9ba
9 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autotests/testFT-8021x-roam/connection_test.py
View File

@ -79,11 +79,9 @@ class Test(unittest.TestCase):
# Check that iwd is on BSS 1 once out of roaming state and doesn't # Check that iwd is on BSS 1 once out of roaming state and doesn't
# go through 'disconnected', 'autoconnect', 'connecting' in between # go through 'disconnected', 'autoconnect', 'connecting' in between
condition = 'obj.state != DeviceState.roaming' from_condition = 'obj.state == DeviceState.roaming'
wd.wait_for_object_condition(device, condition) to_condition = 'obj.state == DeviceState.connected'
wd.wait_for_object_change(device, from_condition, to_condition)
condition = 'obj.state == DeviceState.connected'
wd.wait_for_object_condition(device, condition)
self.assertTrue(self.bss_hostapd[1].list_sta()) self.assertTrue(self.bss_hostapd[1].list_sta())

8
autotests/testFT-FILS-SHA256/connection_test.py
View File

@ -109,11 +109,9 @@ class Test(unittest.TestCase):
# Check that iwd is on BSS 1 once out of roaming state and doesn't # Check that iwd is on BSS 1 once out of roaming state and doesn't
# go through 'disconnected', 'autoconnect', 'connecting' in between # go through 'disconnected', 'autoconnect', 'connecting' in between
condition = 'obj.state != DeviceState.roaming' from_condition = 'obj.state == DeviceState.roaming'
wd.wait_for_object_condition(device, condition) to_condition = 'obj.state == DeviceState.connected'
wd.wait_for_object_change(device, from_condition, to_condition)
condition = 'obj.state == DeviceState.connected'
wd.wait_for_object_condition(device, condition)
self.assertTrue(self.bss_hostapd[1].list_sta()) self.assertTrue(self.bss_hostapd[1].list_sta())

6
autotests/testFT-FILS-SHA384/connection_test.py
View File

@ -109,10 +109,10 @@ class Test(unittest.TestCase):
# Check that iwd is on BSS 1 once out of roaming state and doesn't # Check that iwd is on BSS 1 once out of roaming state and doesn't
# go through 'disconnected', 'autoconnect', 'connecting' in between # go through 'disconnected', 'autoconnect', 'connecting' in between
condition = 'obj.state != DeviceState.roaming' from_condition = 'obj.state == DeviceState.roaming'
wd.wait_for_object_condition(device, condition) to_condition = 'obj.state == DeviceState.connected'
wd.wait_for_object_change(device, from_condition, to_condition)
self.assertEqual(device.state, iwd.DeviceState.connected)
self.assertTrue(self.bss_hostapd[1].list_sta()) self.assertTrue(self.bss_hostapd[1].list_sta())
testutil.test_iface_operstate(device.name) testutil.test_iface_operstate(device.name)

8
autotests/testFT-PSK-over-DS/connection_test.py
View File

@ -85,11 +85,9 @@ class Test(unittest.TestCase):
# Check that iwd is on BSS 1 once out of roaming state and doesn't # Check that iwd is on BSS 1 once out of roaming state and doesn't
# go through 'disconnected', 'autoconnect', 'connecting' in between # go through 'disconnected', 'autoconnect', 'connecting' in between
condition = 'obj.state != DeviceState.roaming' from_condition = 'obj.state == DeviceState.roaming'
wd.wait_for_object_condition(device, condition) to_condition = 'obj.state == DeviceState.connected'
wd.wait_for_object_change(device, from_condition, to_condition)
condition = 'obj.state == DeviceState.connected'
wd.wait_for_object_condition(device, condition)
self.assertTrue(self.bss_hostapd[1].list_sta()) self.assertTrue(self.bss_hostapd[1].list_sta())

7
autotests/testFT-PSK-roam/connection_test.py
View File

@ -87,11 +87,10 @@ class Test(unittest.TestCase):
# Check that iwd is on BSS 1 once out of roaming state and doesn't # Check that iwd is on BSS 1 once out of roaming state and doesn't
# go through 'disconnected', 'autoconnect', 'connecting' in between # go through 'disconnected', 'autoconnect', 'connecting' in between
condition = 'obj.state != DeviceState.roaming' from_condition = 'obj.state == DeviceState.roaming'
wd.wait_for_object_condition(device, condition) to_condition = 'obj.state == DeviceState.connected'
wd.wait_for_object_change(device, from_condition, to_condition)
condition = 'obj.state == DeviceState.connected'
wd.wait_for_object_condition(device, condition)
self.assertTrue(self.bss_hostapd[1].list_sta()) self.assertTrue(self.bss_hostapd[1].list_sta())
testutil.test_iface_operstate(device.name) testutil.test_iface_operstate(device.name)

6
autotests/testFT-SAE-roam/connection_test.py
View File

@ -91,15 +91,15 @@ class Test(unittest.TestCase):
# Check that iwd is on BSS 1 once out of roaming state and doesn't # Check that iwd is on BSS 1 once out of roaming state and doesn't
# go through 'disconnected', 'autoconnect', 'connecting' in between # go through 'disconnected', 'autoconnect', 'connecting' in between
condition = 'obj.state != DeviceState.roaming' from_condition = 'obj.state == DeviceState.roaming'
wd.wait_for_object_condition(device, condition) to_condition = 'obj.state == DeviceState.connected'
wd.wait_for_object_change(device, from_condition, to_condition)
rule1.signal = -2000 rule1.signal = -2000
# wait for IWD's signal levels to recover # wait for IWD's signal levels to recover
wd.wait(5) wd.wait(5)
self.assertEqual(device.state, iwd.DeviceState.connected)
self.assertTrue(self.bss_hostapd[1].list_sta()) self.assertTrue(self.bss_hostapd[1].list_sta())
testutil.test_iface_operstate(device.name) testutil.test_iface_operstate(device.name)

6
autotests/testPreauth-roam/connection_test.py
View File

@ -97,10 +97,10 @@ class Test(unittest.TestCase):
# Check that iwd is on BSS 1 once out of roaming state and doesn't # Check that iwd is on BSS 1 once out of roaming state and doesn't
# go through 'disconnected', 'autoconnect', 'connecting' in between # go through 'disconnected', 'autoconnect', 'connecting' in between
condition = 'obj.state != DeviceState.roaming' from_condition = 'obj.state == DeviceState.roaming'
wd.wait_for_object_condition(device, condition) to_condition = 'obj.state == DeviceState.connected'
wd.wait_for_object_change(device, from_condition, to_condition)
self.assertEqual(device.state, iwd.DeviceState.connected)
self.assertTrue(bss_hostapd[1].list_sta()) self.assertTrue(bss_hostapd[1].list_sta())
testutil.test_iface_operstate(device.name) testutil.test_iface_operstate(device.name)

6
autotests/testRoamRetry/fast_retry_test.py
View File

@ -117,10 +117,10 @@ class Test(unittest.TestCase):
# Check that iwd is on BSS 1 once out of roaming state and doesn't # Check that iwd is on BSS 1 once out of roaming state and doesn't
# go through 'disconnected', 'autoconnect', 'connecting' in between # go through 'disconnected', 'autoconnect', 'connecting' in between
condition = 'obj.state != DeviceState.roaming' from_condition = 'obj.state == DeviceState.roaming'
wd.wait_for_object_condition(device, condition, max_wait=5) to_condition = 'obj.state == DeviceState.connected'
wd.wait_for_object_change(device, from_condition, to_condition)
self.assertEqual(device.state, iwd.DeviceState.connected)
self.assertTrue(bss_hostapd[1].list_sta()) self.assertTrue(bss_hostapd[1].list_sta())
device.disconnect() device.disconnect()

6
autotests/testRoamRetry/stop_retry_test.py
View File

@ -92,10 +92,10 @@ class Test(unittest.TestCase):
# Check that iwd is on BSS 1 once out of roaming state and doesn't # Check that iwd is on BSS 1 once out of roaming state and doesn't
# go through 'disconnected', 'autoconnect', 'connecting' in between # go through 'disconnected', 'autoconnect', 'connecting' in between
condition = 'obj.state != DeviceState.roaming' from_condition = 'obj.state == DeviceState.roaming'
wd.wait_for_object_condition(device, condition) to_condition = 'obj.state == DeviceState.connected'
wd.wait_for_object_change(device, from_condition, to_condition)
self.assertEqual(device.state, iwd.DeviceState.connected)
self.assertTrue(bss_hostapd[1].list_sta()) self.assertTrue(bss_hostapd[1].list_sta())
# Now make sure that we don't roam anymore. In order to catch this via # Now make sure that we don't roam anymore. In order to catch this via