]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
tests: Fix mesh_open_vht_160 false negative by using common finalizer
authorMasashi Honma <masashi.honma@gmail.com>
Sun, 28 Jun 2020 23:23:07 +0000 (08:23 +0900)
committerJouni Malinen <j@w1.fi>
Mon, 12 Oct 2020 08:18:53 +0000 (11:18 +0300)
mesh_open_vht_160 might fail with this message:

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

This patch fixes the issue.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
tests/hwsim/test_wpas_mesh.py

index b10a5d1f5456fe1ecf94497581ef7b3c9cd4fb8d..64e3cc66def59d181f58655c960836e8cb7cc693 100644 (file)
@@ -1165,11 +1165,7 @@ def test_mesh_open_vht_160(dev, apdev):
     try:
         _test_mesh_open_vht_160(dev, apdev)
     finally:
-        dev[0].request("MESH_GROUP_REMOVE " + dev[0].ifname)
-        dev[1].request("MESH_GROUP_REMOVE " + dev[1].ifname)
-        subprocess.call(['iw', 'reg', 'set', '00'])
-        dev[0].flush_scan_cache()
-        dev[1].flush_scan_cache()
+        clear_reg_setting(dev)
 
 def _test_mesh_open_vht_160(dev, apdev):
     check_mesh_support(dev[0])