tests: Move hessid and access_network_type reset to test case

This removes unnecessary reset() steps from between every test case.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2014-11-28 16:16:24 +02:00 committed by Jouni Malinen
parent 47dcb1186f
commit e4d7b5134e
2 changed files with 7 additions and 2 deletions

View file

@ -241,6 +241,13 @@ def test_ap_nai_home_realm_query(dev, apdev):
def test_ap_interworking_scan_filtering(dev, apdev): def test_ap_interworking_scan_filtering(dev, apdev):
"""Interworking scan filtering with HESSID and access network type""" """Interworking scan filtering with HESSID and access network type"""
try:
return _test_ap_interworking_scan_filtering(dev, apdev)
finally:
dev[0].request("SET hessid 00:00:00:00:00:00")
dev[0].request("SET access_network_type 15")
def _test_ap_interworking_scan_filtering(dev, apdev):
bssid = apdev[0]['bssid'] bssid = apdev[0]['bssid']
params = hs20_ap_params() params = hs20_ap_params()
ssid = "test-hs20-ap1" ssid = "test-hs20-ap1"

View file

@ -93,8 +93,6 @@ class WpaSupplicant:
logger.info("FLUSH to " + self.ifname + " failed: " + res) logger.info("FLUSH to " + self.ifname + " failed: " + res)
self.request("WPS_ER_STOP") self.request("WPS_ER_STOP")
self.request("SET pmf 0") self.request("SET pmf 0")
self.request("SET hessid 00:00:00:00:00:00")
self.request("SET access_network_type 15")
self.request("SET p2p_add_cli_chan 0") self.request("SET p2p_add_cli_chan 0")
self.request("SET p2p_no_go_freq ") self.request("SET p2p_no_go_freq ")
self.request("SET p2p_pref_chan ") self.request("SET p2p_pref_chan ")