From: Masashi Honma Date: Thu, 27 Jun 2019 05:44:44 +0000 (+0900) Subject: tests: Fix rrm_beacon_req_passive_scan_vht false negative by using common finalizer X-Git-Tag: hostap_2_9~43 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=faaaa4e2a9ca2950f441680348cd4a7aa74ca3c6;p=thirdparty%2Fhostap.git tests: Fix rrm_beacon_req_passive_scan_vht false negative by using common finalizer rrm_beacon_req_passive_scan_vht fails with this message: --------------- wlan0: Country code not reset back to 00: is FI wlan0: Country code cleared back to 00 --------------- hostap commit 91b6eba7732354ed3dfe0aa9715dc4c0746e3336 'Move MAC address randomization enable/disable to helper functions'. wireless-testing commit 66c112cbd1d44d05322bb4eef908c82a68adbb5e tag: wt-2019-06-26. This patch fixes the issue. Signed-off-by: Masashi Honma --- diff --git a/tests/hwsim/test_rrm.py b/tests/hwsim/test_rrm.py index 81a94963c..c9c8d6103 100644 --- a/tests/hwsim/test_rrm.py +++ b/tests/hwsim/test_rrm.py @@ -1668,12 +1668,7 @@ def test_rrm_beacon_req_passive_scan_vht(dev, apdev): raise HwsimSkip("80 MHz channel not supported in regulatory information") raise finally: - if hapd: - hapd.request("DISABLE") - dev[0].disconnect_and_stop_scan() - subprocess.call(['iw', 'reg', 'set', '00']) - dev[0].wait_event(["CTRL-EVENT-REGDOM-CHANGE"], timeout=0.5) - dev[0].flush_scan_cache() + clear_regdom(hapd, dev) def test_rrm_beacon_req_passive_scan_vht160(dev, apdev): """Beacon request - passive scan mode - VHT160"""