tests: Work around race condition for TRANSITION-DISABLE processing

This event may be sent before CTRL-EVENT-CONNECTED, so modify the test
cases to wait directly for TRANSITION-DISABLE by skipping the separate
wait for CTRL-EVENT-CONNECTED.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>

diff --git a/tests/hwsim/test_ap_eap.py b/tests/hwsim/test_ap_eap.py
index 7c15341e54f8036c348641701efb105e5c95909d..6f969dbbae872ee83df0dd451bbfb39ff3f0c5d6 100644 (file)
--- a/tests/hwsim/test_ap_eap.py
+++ b/tests/hwsim/test_ap_eap.py
@@ -7813,8 +7813,8 @@ def test_ap_wpa3_eap_transition_disable(dev, apdev):
                         proto="WPA WPA2", pairwise="CCMP", group="TKIP CCMP",
                         eap="GPSK", identity="gpsk user",
                         password="abcdefghijklmnop0123456789abcdef",
-                        scan_freq="2412")
-    ev = dev[0].wait_event(["TRANSITION-DISABLE"], timeout=1)
+                        scan_freq="2412", wait_connect=False)
+    ev = dev[0].wait_event(["TRANSITION-DISABLE"], timeout=20)
     if ev is None:
         raise Exception("Transition disable not indicated")
     if ev.split(' ')[1] != "04":

diff --git a/tests/hwsim/test_owe.py b/tests/hwsim/test_owe.py
index 733c7b4222b916fe74d02f8b4a3bab0ea82bb0c2..17cae9fcadfeae673d16e5a10ca16bc70a49e83b 100644 (file)
--- a/tests/hwsim/test_owe.py
+++ b/tests/hwsim/test_owe.py
@@ -976,9 +976,9 @@ def test_owe_transition_mode_disable(dev, apdev):
     dev[0].scan_for_bss(bssid2, freq="2412")
 
     id = dev[0].connect("owe-test", key_mgmt="OWE", ieee80211w="2",
-                        scan_freq="2412")
+                        scan_freq="2412", wait_connect=False)
 
-    ev = dev[0].wait_event(["TRANSITION-DISABLE"], timeout=1)
+    ev = dev[0].wait_event(["TRANSITION-DISABLE"], timeout=15)
     if ev is None:
         raise Exception("Transition disable not indicated")
     if ev.split(' ')[1] != "08":

diff --git a/tests/hwsim/test_sae.py b/tests/hwsim/test_sae.py
index 97361d80631f2cdc0ebad02540c280c66a032c2e..7deb60257b3e4f152eb61b45413b09c8c39ed975 100644 (file)
--- a/tests/hwsim/test_sae.py
+++ b/tests/hwsim/test_sae.py
@@ -501,8 +501,8 @@ def test_sae_and_psk_transition_disable(dev, apdev):
 
     dev[0].request("SET sae_groups ")
     id = dev[0].connect("test-sae", psk="12345678", key_mgmt="SAE WPA-PSK",
-                        ieee80211w="1", scan_freq="2412")
-    ev = dev[0].wait_event(["TRANSITION-DISABLE"], timeout=1)
+                        ieee80211w="1", scan_freq="2412", wait_connect=False)
+    ev = dev[0].wait_event(["TRANSITION-DISABLE"], timeout=15)
     if ev is None:
         raise Exception("Transition disable not indicated")
     if ev.split(' ')[1] != "01":

diff --git a/tests/hwsim/test_sae_pk.py b/tests/hwsim/test_sae_pk.py
index 3bbc62ecd0bac3bb2fde312dd1c9a064cbb8356f..236082be73c6d9c2d19c70927e69139f18b56de4 100644 (file)
--- a/tests/hwsim/test_sae_pk.py
+++ b/tests/hwsim/test_sae_pk.py
@@ -259,8 +259,8 @@ def test_sae_pk_transition_disable(dev, apdev):
     hapd = hostapd.add_ap(apdev[0], params)
 
     id = dev[0].connect(SAE_PK_SSID, sae_password=SAE_PK_SEC3_PW,
-                        key_mgmt="SAE", scan_freq="2412")
-    ev = dev[0].wait_event(["TRANSITION-DISABLE"], timeout=1)
+                        key_mgmt="SAE", scan_freq="2412", wait_connect=False)
+    ev = dev[0].wait_event(["TRANSITION-DISABLE"], timeout=15)
     if ev is None:
         raise Exception("Transition disable not indicated")
     if ev.split(' ')[1] != "02":

diff --git a/tests/hwsim/test_sigma_dut.py b/tests/hwsim/test_sigma_dut.py
index c457f73098bf4d517db8bdd1e94156d8ba16e159..515afae69e49e5cdd104b3ac4465a8ea83baffed 100644 (file)
--- a/tests/hwsim/test_sigma_dut.py
+++ b/tests/hwsim/test_sigma_dut.py
@@ -5791,8 +5791,8 @@ def test_sigma_dut_ap_transition_disable(dev, apdev, params):
 
             dev[0].set("sae_groups", "")
             dev[0].connect("test-sae", key_mgmt="SAE", psk="12345678",
-                           ieee80211w="2", scan_freq="2412")
-            ev = dev[0].wait_event(["TRANSITION-DISABLE"], timeout=1)
+                           ieee80211w="2", scan_freq="2412", wait_connect=False)
+            ev = dev[0].wait_event(["TRANSITION-DISABLE"], timeout=15)
             if ev is None:
                 raise Exception("Transition disable not indicated")
             if ev.split(' ')[1] != "01":
@@ -5816,8 +5816,8 @@ def test_sigma_dut_ap_transition_disable_change(dev, apdev, params):
             sigma_dut_cmd_check("ap_config_commit,NAME,AP")
             dev[0].set("sae_groups", "")
             dev[0].connect("test-sae", key_mgmt="SAE", psk="12345678",
-                           ieee80211w="2", scan_freq="2412")
-            ev = dev[0].wait_event(["TRANSITION-DISABLE"], timeout=1)
+                           ieee80211w="2", scan_freq="2412", wait_connect=False)
+            ev = dev[0].wait_event(["TRANSITION-DISABLE"], timeout=15)
             if ev is not None:
                 raise Exception("Unexpected transition disable indication")
             dev[0].request("DISCONNECT")
@@ -5826,8 +5826,7 @@ def test_sigma_dut_ap_transition_disable_change(dev, apdev, params):
 
             sigma_dut_cmd_check("ap_set_rfeature,NAME,AP,Transition_Disable,1,Transition_Disable_Index,0")
             dev[0].request("RECONNECT")
-            dev[0].wait_connected()
-            ev = dev[0].wait_event(["TRANSITION-DISABLE"], timeout=1)
+            ev = dev[0].wait_event(["TRANSITION-DISABLE"], timeout=15)
             if ev is None:
                 raise Exception("Transition disable not indicated")
             if ev.split(' ')[1] != "01":

diff --git a/tests/hwsim/test_wpas_ap.py b/tests/hwsim/test_wpas_ap.py
index b2e605920f07ae2dc7fd45ecb93ee41f9bd897a6..20604e890bbc394b2e844fc1fff31482d8ba894d 100644 (file)
--- a/tests/hwsim/test_wpas_ap.py
+++ b/tests/hwsim/test_wpas_ap.py
@@ -978,8 +978,8 @@ def test_wpas_ap_sae_and_psk_transition_disable(dev):
     dev[1].set("sae_groups", "")
     dev[1].connect("wpas-ap-sae", key_mgmt="SAE WPA-PSK",
                    psk="12345678", ieee80211w="1",
-                   scan_freq="2412")
-    ev = dev[1].wait_event(["TRANSITION-DISABLE"], timeout=1)
+                   scan_freq="2412", wait_connect=False)
+    ev = dev[1].wait_event(["TRANSITION-DISABLE"], timeout=15)
     if ev is None:
         raise Exception("Transition disable not indicated")
     if ev.split(' ')[1] != "01":