tests: Make owe_transition_mode_multi_bss more robust

Fix bssid2 value to make scanning more reliable for the second OWE BSS.
In addition, reorder the STA status checks to happen before the data
connectivity check to get more accurate failure reason into the log if
the test case fails.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/tests/hwsim/test_owe.py b/tests/hwsim/test_owe.py
index 4efc3d24aad1fc0756487387cd4e8bd01306e442..98092674347e0735a1d8ab5c4cf0d4a2f8440562 100644 (file)
--- a/tests/hwsim/test_owe.py
+++ b/tests/hwsim/test_owe.py
@@ -234,6 +234,7 @@ def run_owe_transition_mode_multi_bss(dev, apdev):
     ifname2 = apdev[0]['ifname'] + '-2'
     hapd1 = hostapd.add_bss(apdev[0], ifname1, 'owe-bss-1.conf')
     hapd2 = hostapd.add_bss(apdev[0], ifname2, 'owe-bss-2.conf')
+    hapd2.bssidx = 1
 
     bssid = hapd1.own_addr()
     bssid2 = hapd2.own_addr()
@@ -247,10 +248,13 @@ def run_owe_transition_mode_multi_bss(dev, apdev):
     dev[0].scan_for_bss(bssid2, freq="2412")
     dev[0].scan_for_bss(bssid, freq="2412")
     dev[0].connect("transition-mode-open", key_mgmt="OWE")
-    hwsim_utils.test_connectivity(dev[0], hapd2)
+    val = dev[0].get_status_field("bssid")
+    if val != bssid2:
+        raise Exception("Unexpected bssid: " + val)
     val = dev[0].get_status_field("key_mgmt")
     if val != "OWE":
         raise Exception("Unexpected key_mgmt: " + val)
+    hwsim_utils.test_connectivity(dev[0], hapd2)
 
 def test_owe_unsupported_group(dev, apdev):
     """Opportunistic Wireless Encryption and unsupported group"""