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

tests: Fix p2p_channel_5ghz_only false negative by using common finalizer

p2p_channel_5ghz_only 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>
---

diff --git a/tests/hwsim/test_p2p_channel.py b/tests/hwsim/test_p2p_channel.py
index 374e7e19f..ada293b7a 100644
--- a/tests/hwsim/test_p2p_channel.py
+++ b/tests/hwsim/test_p2p_channel.py
@@ -730,8 +730,8 @@ def test_p2p_channel_5ghz_only(dev):
             raise Exception("Unexpected channel %d MHz" % freq)
         dev[0].remove_group()
     finally:
-        set_country("00")
         dev[0].global_request("P2P_SET disallow_freq ")
+        clear_regdom_dev(dev)
 
 def test_p2p_channel_5ghz_165_169_us(dev):
     """P2P GO and 5 GHz channels 165 (allowed) and 169 (disallowed) in US"""