From cbe7e44d1ba89c86d72fd03d9c89f4d73ce0034e Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Thu, 27 Jun 2019 14:44:51 +0900 Subject: [PATCH] tests: Fix wep_ht_vht false negative by using common finalizer wep_ht_vht fails with this message: --------------- wlan0: Country code not reset back to 00: is SE wlan0: Country code cleared back to 00 --------------- hostap commit 91b6eba7732354ed3dfe0aa9715dc4c0746e3336 'Move MAC address randomization enable/disable to helper functions'. wireless-testing commit 66c112cbd1d44d05322bb4eef908c82a68adbb5e tag: wt-2019-06-26. This patch fixes the issue. Signed-off-by: Masashi Honma --- tests/hwsim/test_wep.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/hwsim/test_wep.py b/tests/hwsim/test_wep.py index 318018460..d6af730ae 100644 --- a/tests/hwsim/test_wep.py +++ b/tests/hwsim/test_wep.py @@ -11,6 +11,7 @@ import subprocess from remotehost import remote_compatible import hostapd import hwsim_utils +from utils import clear_regdom @remote_compatible def test_wep_open_auth(dev, apdev): @@ -119,10 +120,7 @@ def test_wep_ht_vht(dev, apdev): raise Exception("Unexpected STATUS secondary_channel value") finally: dev[0].request("DISCONNECT") - if hapd: - hapd.request("DISABLE") - subprocess.call(['iw', 'reg', 'set', '00']) - dev[0].flush_scan_cache() + clear_regdom(hapd, dev) def test_wep_ifdown(dev, apdev): """AP with WEP and external ifconfig down""" -- 2.39.2