From 0bea288fbe9cdbae411ed6b3cb3e450c9d6f5ae1 Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Mon, 29 Jun 2020 08:23:02 +0900 Subject: [PATCH] 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 --- tests/hwsim/test_wpas_mesh.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/hwsim/test_wpas_mesh.py b/tests/hwsim/test_wpas_mesh.py index 8298d482d..6e32ce67e 100644 --- a/tests/hwsim/test_wpas_mesh.py +++ b/tests/hwsim/test_wpas_mesh.py @@ -906,11 +906,7 @@ def test_wpas_mesh_open_5ghz(dev, apdev): try: _test_wpas_mesh_open_5ghz(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_wpas_mesh_open_5ghz(dev, apdev): check_mesh_support(dev[0])