From cd258df337143c6f2a0c5fc932d55177299c8132 Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Wed, 28 Sep 2022 09:36:36 -0700 Subject: [PATCH] auto-t: update uses of wait_for_object_change This removes waiting for DeviceState.roaming, which is now done automatically by wait_for_object_change. --- autotests/testFT-8021x-roam/connection_test.py | 3 --- autotests/testFT-FILS/connection_test.py | 3 --- autotests/testOWE/connection_test.py | 3 --- autotests/testPSK-roam/connection_test.py | 6 ------ autotests/testPreauth-roam/connection_test.py | 3 --- autotests/testRoamRetry/fast_retry_test.py | 3 --- autotests/testRoamRetry/stop_retry_test.py | 3 --- autotests/testSAE-roam/connection_test.py | 3 --- 8 files changed, 27 deletions(-) diff --git a/autotests/testFT-8021x-roam/connection_test.py b/autotests/testFT-8021x-roam/connection_test.py index d3f8e2c6..356a9af2 100644 --- a/autotests/testFT-8021x-roam/connection_test.py +++ b/autotests/testFT-8021x-roam/connection_test.py @@ -37,9 +37,6 @@ class Test(unittest.TestCase): device.roam(self.bss_hostapd[1].bssid) - condition = 'obj.state == DeviceState.roaming' - wd.wait_for_object_condition(device, condition) - # Check that iwd is on BSS 1 once out of roaming state and doesn't # go through 'disconnected', 'autoconnect', 'connecting' in between from_condition = 'obj.state == DeviceState.roaming' diff --git a/autotests/testFT-FILS/connection_test.py b/autotests/testFT-FILS/connection_test.py index 5d60bf4d..28aaa955 100644 --- a/autotests/testFT-FILS/connection_test.py +++ b/autotests/testFT-FILS/connection_test.py @@ -70,9 +70,6 @@ class Test(unittest.TestCase): #rule0.signal = -8000 device.roam(self.bss_hostapd[1].bssid) - condition = 'obj.state == DeviceState.roaming' - wd.wait_for_object_condition(device, condition) - # Check that iwd is on BSS 1 once out of roaming state and doesn't # go through 'disconnected', 'autoconnect', 'connecting' in between from_condition = 'obj.state == DeviceState.roaming' diff --git a/autotests/testOWE/connection_test.py b/autotests/testOWE/connection_test.py index 391d8cf5..1fdc990a 100644 --- a/autotests/testOWE/connection_test.py +++ b/autotests/testOWE/connection_test.py @@ -53,9 +53,6 @@ class Test(unittest.TestCase): device.roam(hapd1.bssid) - condition = 'obj.state == DeviceState.roaming' - wd.wait_for_object_condition(device, condition) - from_condition = 'obj.state == DeviceState.roaming' to_condition = 'obj.state == DeviceState.connected' wd.wait_for_object_change(device, from_condition, to_condition) diff --git a/autotests/testPSK-roam/connection_test.py b/autotests/testPSK-roam/connection_test.py index 2206f120..7a135e95 100644 --- a/autotests/testPSK-roam/connection_test.py +++ b/autotests/testPSK-roam/connection_test.py @@ -52,9 +52,6 @@ class Test(unittest.TestCase): else: device.roam(self.bss_hostapd[1].bssid) - condition = 'obj.state == DeviceState.roaming' - wd.wait_for_object_condition(device, condition) - # Check that iwd is on BSS 1 once out of roaming state and doesn't # go through 'disconnected', 'autoconnect', 'connecting' in between from_condition = 'obj.state == DeviceState.roaming' @@ -76,9 +73,6 @@ class Test(unittest.TestCase): device.roam(self.bss_hostapd[0].bssid) - condition = 'obj.state == DeviceState.roaming' - wd.wait_for_object_condition(device, condition) - # Check that iwd is on BSS 0 once out of roaming state and doesn't # go through 'disconnected', 'autoconnect', 'connecting' in between from_condition = 'obj.state == DeviceState.roaming' diff --git a/autotests/testPreauth-roam/connection_test.py b/autotests/testPreauth-roam/connection_test.py index 02d03361..87799df1 100644 --- a/autotests/testPreauth-roam/connection_test.py +++ b/autotests/testPreauth-roam/connection_test.py @@ -48,9 +48,6 @@ class Test(unittest.TestCase): device.roam(bss1_addr) - condition = 'obj.state == DeviceState.roaming' - wd.wait_for_object_condition(device, condition) - # TODO: verify that the PMK from preauthentication was used # Check that iwd is on BSS 1 once out of roaming state and doesn't diff --git a/autotests/testRoamRetry/fast_retry_test.py b/autotests/testRoamRetry/fast_retry_test.py index 373f3d45..d380b2e3 100644 --- a/autotests/testRoamRetry/fast_retry_test.py +++ b/autotests/testRoamRetry/fast_retry_test.py @@ -91,9 +91,6 @@ class Test(unittest.TestCase): rule0.signal = -8000 rule1.signal = -2000 - condition = 'obj.state == DeviceState.roaming' - wd.wait_for_object_condition(device, condition) - # Check that iwd is on BSS 1 once out of roaming state and doesn't # go through 'disconnected', 'autoconnect', 'connecting' in between from_condition = 'obj.state == DeviceState.roaming' diff --git a/autotests/testRoamRetry/stop_retry_test.py b/autotests/testRoamRetry/stop_retry_test.py index b5eb6f77..e46b79d7 100644 --- a/autotests/testRoamRetry/stop_retry_test.py +++ b/autotests/testRoamRetry/stop_retry_test.py @@ -67,9 +67,6 @@ class Test(unittest.TestCase): # connects to BSS 1 rule0.signal = -8000 - condition = 'obj.state == DeviceState.roaming' - wd.wait_for_object_condition(device, condition) - # Check that iwd is on BSS 1 once out of roaming state and doesn't # go through 'disconnected', 'autoconnect', 'connecting' in between from_condition = 'obj.state == DeviceState.roaming' diff --git a/autotests/testSAE-roam/connection_test.py b/autotests/testSAE-roam/connection_test.py index ac44b4b2..ca7234a6 100644 --- a/autotests/testSAE-roam/connection_test.py +++ b/autotests/testSAE-roam/connection_test.py @@ -39,9 +39,6 @@ class Test(unittest.TestCase): device.roam(self.bss_hostapd[1].bssid) - condition = 'obj.state == DeviceState.roaming' - wd.wait_for_object_condition(device, condition) - # Check that iwd is on BSS 1 once out of roaming state and doesn't # go through 'disconnected', 'autoconnect', 'connecting' in between from_condition = 'obj.state == DeviceState.roaming'