From: Masashi Honma <masashi.honma@gmail.com>
Date: Tue, 25 Jun 2019 01:50:38 +0000 (+0900)
Subject: tests: Fix nfc_wps_handover_chan14 false negative by using common finalizer
X-Git-Tag: hostap_2_9~128
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0eb6e536dd5cfe9e1c01e8390f0d2e9d33a47c1;p=thirdparty%2Fhostap.git

tests: Fix nfc_wps_handover_chan14 false negative by using common finalizer

nfc_wps_handover_chan14 fails with this message.

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

This patch fixes the issue.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
---

diff --git a/tests/hwsim/test_nfc_wps.py b/tests/hwsim/test_nfc_wps.py
index 74476852b..c15d2ea89 100644
--- a/tests/hwsim/test_nfc_wps.py
+++ b/tests/hwsim/test_nfc_wps.py
@@ -336,10 +336,7 @@ def test_nfc_wps_handover_chan14(dev, apdev):
         check_wpa2_connection(dev[0], apdev[0], hapd, ssid)
     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_nfc_wps_handover_with_pw_token_set(dev, apdev):
     """Connect to WPS AP with NFC connection handover (wps_nfc_* set)"""