From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Mon, 4 Nov 2013 12:45:41 +0000 (+0200)
Subject: tests: Verify INTERWORKING-SELECTED in HS 2.0 policy tests
X-Git-Tag: hostap_2_2~744
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=953a574d4982a5eef902420c06834abc6f93cb82;p=thirdparty%2Fhostap.git

tests: Verify INTERWORKING-SELECTED in HS 2.0 policy tests

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
---

diff --git a/tests/hwsim/test_ap_hs20.py b/tests/hwsim/test_ap_hs20.py
index b8ef861c4..4a727c67a 100644
--- a/tests/hwsim/test_ap_hs20.py
+++ b/tests/hwsim/test_ap_hs20.py
@@ -712,18 +712,24 @@ def policy_test(dev, ap, values, only_one=True):
     dev.request("INTERWORKING_SELECT auto freq=2412")
     while True:
         ev = dev.wait_event(["INTERWORKING-AP", "INTERWORKING-NO-MATCH",
-                             "CTRL-EVENT-CONNECTED"], timeout=15)
+                             "INTERWORKING-SELECTED"], timeout=15)
         if ev is None:
-            raise Exception("Connection timed out")
+            raise Exception("Network selection timed out")
         if "INTERWORKING-NO-MATCH" in ev:
             raise Exception("Matching AP not found")
         if only_one and "INTERWORKING-AP" in ev and bssid not in ev:
             raise Exception("Unexpected AP claimed acceptable")
-        if "CTRL-EVENT-CONNECTED" in ev:
+        if "INTERWORKING-SELECTED" in ev:
             if bssid not in ev:
-                raise Exception("Connected to incorrect BSS")
+                raise Exception("Selected incorrect BSS")
             break
 
+    ev = dev.wait_event(["CTRL-EVENT-CONNECTED"], timeout=15)
+    if ev is None:
+        raise Exception("Connection timed out")
+    if bssid not in ev:
+        raise Exception("Connected to incorrect BSS")
+
     conn_bssid = dev.get_status_field("bssid")
     if conn_bssid != bssid:
         raise Exception("bssid information points to incorrect BSS")