]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
tests: Fix p2p_channel_5ghz_only false negative by using common finalizer
authorMasashi Honma <masashi.honma@gmail.com>
Tue, 25 Jun 2019 01:51:06 +0000 (10:51 +0900)
committerJouni Malinen <j@w1.fi>
Wed, 26 Jun 2019 17:42:20 +0000 (20:42 +0300)
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>
tests/hwsim/test_p2p_channel.py

index 374e7e19fae1d1abfbe91eb44c4ed08614198718..ada293b7a9ce4969a0d531cb9aff4c03e8e647f3 100644 (file)
@@ -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"""