From cb5f7f552faf17d4624f15fd6c5259e1c39ca84b Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Thu, 27 Jun 2019 14:44:50 +0900 Subject: [PATCH] tests: Fix ap_wps_conf_5ghz false negative by using common finalizer ap_wps_conf_5ghz 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 --- tests/hwsim/test_ap_wps.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/hwsim/test_ap_wps.py b/tests/hwsim/test_ap_wps.py index 49d848757..60b36c251 100644 --- a/tests/hwsim/test_ap_wps.py +++ b/tests/hwsim/test_ap_wps.py @@ -268,10 +268,7 @@ def test_ap_wps_conf_5ghz(dev, apdev): raise Exception("Device name not available in STA command") finally: dev[0].request("DISCONNECT") - if hapd: - hapd.request("DISABLE") - subprocess.call(['iw', 'reg', 'set', '00']) - dev[0].flush_scan_cache() + clear_regdom(hapd, dev) def test_ap_wps_conf_chan14(dev, apdev): """WPS PBC provisioning with configured AP on channel 14"""