tests: Fix p2p_autogo_pref_chan_not_in_regulatory false negative by using common finalizer

p2p_autogo_pref_chan_not_in_regulatory fails with this message.

---------------
wlan0: Country code not reset back to 00: is SE
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 2019-06-25 10:51:04 +09:00 committed by Jouni Malinen
parent b57d883c2c
commit e6c82d450e

View file

@ -17,6 +17,7 @@ from tshark import run_tshark
from wpasupplicant import WpaSupplicant from wpasupplicant import WpaSupplicant
from hwsim import HWSimRadio from hwsim import HWSimRadio
from p2p_utils import * from p2p_utils import *
from utils import clear_regdom_dev
def set_country(country, dev=None): def set_country(country, dev=None):
subprocess.call(['iw', 'reg', 'set', country]) subprocess.call(['iw', 'reg', 'set', country])
@ -609,7 +610,7 @@ def test_p2p_autogo_pref_chan_not_in_regulatory(dev, apdev):
dev[0].remove_group(res['ifname']) dev[0].remove_group(res['ifname'])
finally: finally:
dev[0].global_request("SET p2p_pref_chan ") dev[0].global_request("SET p2p_pref_chan ")
set_country("00") clear_regdom_dev(dev)
def run_autogo(dev, param): def run_autogo(dev, param):
if "OK" not in dev.global_request("P2P_GROUP_ADD " + param): if "OK" not in dev.global_request("P2P_GROUP_ADD " + param):