tests: More workarounds for cfg80211 regulatory state clearing (ap_open)

Add even more workarounds for cfg80211 regulatory state clearing since
these DFS test cases seem to be the most likely ones to fail due to
country=98 issues.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-01-06 13:21:19 +02:00
parent df71e16021
commit 9aac73121b

View file

@ -15,7 +15,7 @@ import os
import hostapd import hostapd
import hwsim_utils import hwsim_utils
from tshark import run_tshark from tshark import run_tshark
from utils import alloc_fail, fail_test, wait_fail_trigger from utils import *
from wpasupplicant import WpaSupplicant from wpasupplicant import WpaSupplicant
from test_ap_ht import set_world_reg from test_ap_ht import set_world_reg
@ -770,14 +770,7 @@ def _test_ap_open_country(dev, apdev, country_code, country3):
hapd = None hapd = None
hapd = run_ap_open_country(dev, apdev, country_code, country3) hapd = run_ap_open_country(dev, apdev, country_code, country3)
finally: finally:
if hapd: clear_regdom(hapd, dev)
hapd.request("DISABLE")
dev[0].request("DISCONNECT")
dev[0].request("ABORT_SCAN")
dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5)
set_world_reg(apdev[0], apdev[1], dev[0])
dev[0].wait_event(["CTRL-EVENT-REGDOM-CHANGE"], timeout=0.5)
dev[0].flush_scan_cache()
def run_ap_open_country(dev, apdev, country_code, country3): def run_ap_open_country(dev, apdev, country_code, country3):
hapd = hostapd.add_ap(apdev[0], { "ssid": "open", hapd = hostapd.add_ap(apdev[0], { "ssid": "open",