tests: Handle scan result clearing more carefully in ap_country

If the ABORT_SCAN command succeeds, CTRL-EVENT-SCAN-RESULTS event is
delivered for the aborted scan. Following this with an immediate
flush_scan_cache() call can result in the first scan interpreting that
pending event as the completion and that results in trying to start
another scan while the first scan is still in progress.

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

diff --git a/tests/hwsim/test_ap_params.py b/tests/hwsim/test_ap_params.py
index 8a183c43645ac97aef189a13388f403e4787ccdd..cfd39b9743948cfd5fad78cc2b5abbbb463e5e68 100644 (file)
--- a/tests/hwsim/test_ap_params.py
+++ b/tests/hwsim/test_ap_params.py
@@ -132,8 +132,11 @@ def test_ap_country(dev, apdev):
         if hapd:
             hapd.request("DISABLE")
         dev[0].request("DISCONNECT")
-        dev[0].request("ABORT_SCAN")
-        dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5)
+        res = dev[0].request("ABORT_SCAN")
+        for i in range(2 if "OK" in res else 1):
+                dev[0].wait_event(["CTRL-EVENT-DISCONNECTED",
+                                   "CTRL-EVENT-SCAN-RESULTS"], timeout=0.5)
+        dev[0].dump_monitor()
         hostapd.cmd_execute(apdev[0], ['iw', 'reg', 'set', '00'])
         dev[0].wait_event(["CTRL-EVENT-REGDOM-CHANGE"], timeout=0.5)
         dev[0].flush_scan_cache()