tests: Fix wpas_mesh_open_5ghz false negative by using common finalizer

wpas_mesh_open_5ghz might fail 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>
This commit is contained in:
Masashi Honma 2020-06-29 08:23:02 +09:00 committed by Jouni Malinen
parent ee03056a62
commit 0bea288fbe

View file

@ -906,11 +906,7 @@ def test_wpas_mesh_open_5ghz(dev, apdev):
try: try:
_test_wpas_mesh_open_5ghz(dev, apdev) _test_wpas_mesh_open_5ghz(dev, apdev)
finally: finally:
dev[0].request("MESH_GROUP_REMOVE " + dev[0].ifname) clear_reg_setting(dev)
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()
def _test_wpas_mesh_open_5ghz(dev, apdev): def _test_wpas_mesh_open_5ghz(dev, apdev):
check_mesh_support(dev[0]) check_mesh_support(dev[0])