jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Fix ap_track_sta_force_2ghz false negative by using common finalizer

Browse source 
ap_track_sta_force_2ghz 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:44 +09:00 committed by Jouni Malinen
parent 894caf2d71
commit 4f89533054
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/hwsim/test_ap_track.py
View file

@ -265,19 +265,12 @@ def _test_ap_track_sta_force_5ghz(dev, bssid, bssid2):
def test_ap_track_sta_force_2ghz(dev, apdev): def test_ap_track_sta_force_2ghz(dev, apdev):
"""Dualband AP forcing dualband STA to connect on 2.4 GHz""" """Dualband AP forcing dualband STA to connect on 2.4 GHz"""
try: try:
_test_ap_track_sta_force_2ghz(dev, apdev)
finally:
subprocess.call(['iw', 'reg', 'set', '00'])
time.sleep(0.1)
def _test_ap_track_sta_force_2ghz(dev, apdev):
params = {"ssid": "track", params = {"ssid": "track",
"country_code": "US", "country_code": "US",
"hw_mode": "g", "hw_mode": "g",
"channel": "6", "channel": "6",
"track_sta_max_num": "100"} "track_sta_max_num": "100"}
hapd = hostapd.add_ap(apdev[0], params) hapd = hostapd.add_ap(apdev[0], params)
bssid = apdev[0]['bssid']
params = {"ssid": "track", params = {"ssid": "track",
"country_code": "US", "country_code": "US",
@ -286,8 +279,14 @@ def _test_ap_track_sta_force_2ghz(dev, apdev):
"no_probe_resp_if_seen_on": apdev[0]['ifname'], "no_probe_resp_if_seen_on": apdev[0]['ifname'],
"no_auth_if_seen_on": apdev[0]['ifname']} "no_auth_if_seen_on": apdev[0]['ifname']}
hapd2 = hostapd.add_ap(apdev[1], params) hapd2 = hostapd.add_ap(apdev[1], params)
bssid2 = apdev[1]['bssid']
_test_ap_track_sta_force_2ghz(dev, apdev[0]['bssid'], apdev[1]['bssid'])
finally:
disable_hapd(hapd)
disable_hapd(hapd2)
clear_regdom_dev(dev)
def _test_ap_track_sta_force_2ghz(dev, bssid, bssid2):
dev[0].scan_for_bss(bssid2, freq=5200, force_scan=True) dev[0].scan_for_bss(bssid2, freq=5200, force_scan=True)
dev[0].scan_for_bss(bssid, freq=2437, force_scan=True) dev[0].scan_for_bss(bssid, freq=2437, force_scan=True)