tests: Fix rrm_beacon_req_passive_scan_vht false negative by using common finalizer

rrm_beacon_req_passive_scan_vht fails with this message:

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

hostap commit 91b6eba773
'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 <masashi.honma@gmail.com>
This commit is contained in:
Masashi Honma 2019-06-27 14:44:44 +09:00 committed by Jouni Malinen
parent 3b726df827
commit faaaa4e2a9

View file

@ -1668,12 +1668,7 @@ def test_rrm_beacon_req_passive_scan_vht(dev, apdev):
raise HwsimSkip("80 MHz channel not supported in regulatory information")
raise
finally:
if hapd:
hapd.request("DISABLE")
dev[0].disconnect_and_stop_scan()
subprocess.call(['iw', 'reg', 'set', '00'])
dev[0].wait_event(["CTRL-EVENT-REGDOM-CHANGE"], timeout=0.5)
dev[0].flush_scan_cache()
clear_regdom(hapd, dev)
def test_rrm_beacon_req_passive_scan_vht160(dev, apdev):
"""Beacon request - passive scan mode - VHT160"""