tests: Fix ap_track_sta_no_probe_resp false negative by using common finalizer

ap_track_sta_no_probe_resp fails with this message.

---------------
wlan0: Country code not reset back to 00: is US
wlan0: Country code cleared back to 00
---------------

This patch fixes the issue.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
This commit is contained in:
Masashi Honma 2019-06-25 10:50:40 +09:00 committed by Jouni Malinen
parent 41318114b6
commit e891035f13

View File

@ -84,14 +84,6 @@ def _test_ap_track_sta(dev, hapd, bssid, hapd2, bssid2):
def test_ap_track_sta_no_probe_resp(dev, apdev):
"""Dualband AP not replying to probes from dualband STA on 2.4 GHz"""
try:
_test_ap_track_sta_no_probe_resp(dev, apdev)
finally:
subprocess.call(['iw', 'reg', 'set', '00'])
time.sleep(0.1)
def _test_ap_track_sta_no_probe_resp(dev, apdev):
dev[0].flush_scan_cache()
params = {"ssid": "track",
"country_code": "US",
"hw_mode": "g",
@ -99,7 +91,6 @@ def _test_ap_track_sta_no_probe_resp(dev, apdev):
"beacon_int": "10000",
"no_probe_resp_if_seen_on": apdev[1]['ifname']}
hapd = hostapd.add_ap(apdev[0], params)
bssid = apdev[0]['bssid']
params = {"ssid": "track",
"country_code": "US",
@ -107,7 +98,16 @@ def _test_ap_track_sta_no_probe_resp(dev, apdev):
"channel": "40",
"track_sta_max_num": "100"}
hapd2 = hostapd.add_ap(apdev[1], params)
bssid2 = apdev[1]['bssid']
_test_ap_track_sta_no_probe_resp(dev, apdev[0]['bssid'],
apdev[1]['bssid'])
finally:
disable_hapd(hapd)
disable_hapd(hapd2)
clear_regdom_dev(dev, 2)
def _test_ap_track_sta_no_probe_resp(dev, bssid, bssid2):
dev[0].flush_scan_cache()
dev[0].scan_for_bss(bssid2, freq=5200, force_scan=True)
dev[1].scan_for_bss(bssid, freq=2437, force_scan=True)