From e891035f132954e910287096465c51934340dbe7 Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Tue, 25 Jun 2019 10:50:40 +0900 Subject: [PATCH] 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 --- tests/hwsim/test_ap_track.py | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/hwsim/test_ap_track.py b/tests/hwsim/test_ap_track.py index 560e14181..7b4b9becf 100644 --- a/tests/hwsim/test_ap_track.py +++ b/tests/hwsim/test_ap_track.py @@ -84,31 +84,31 @@ 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) + params = {"ssid": "track", + "country_code": "US", + "hw_mode": "g", + "channel": "6", + "beacon_int": "10000", + "no_probe_resp_if_seen_on": apdev[1]['ifname']} + hapd = hostapd.add_ap(apdev[0], params) + + params = {"ssid": "track", + "country_code": "US", + "hw_mode": "a", + "channel": "40", + "track_sta_max_num": "100"} + hapd2 = hostapd.add_ap(apdev[1], params) + + _test_ap_track_sta_no_probe_resp(dev, apdev[0]['bssid'], + apdev[1]['bssid']) finally: - subprocess.call(['iw', 'reg', 'set', '00']) - time.sleep(0.1) + disable_hapd(hapd) + disable_hapd(hapd2) + clear_regdom_dev(dev, 2) -def _test_ap_track_sta_no_probe_resp(dev, apdev): +def _test_ap_track_sta_no_probe_resp(dev, bssid, bssid2): dev[0].flush_scan_cache() - params = {"ssid": "track", - "country_code": "US", - "hw_mode": "g", - "channel": "6", - "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", - "hw_mode": "a", - "channel": "40", - "track_sta_max_num": "100"} - hapd2 = hostapd.add_ap(apdev[1], params) - bssid2 = apdev[1]['bssid'] - dev[0].scan_for_bss(bssid2, freq=5200, force_scan=True) dev[1].scan_for_bss(bssid, freq=2437, force_scan=True) dev[0].scan(freq=2437, type="ONLY")