jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Fix scan result clearing in ssid_hidden*

Browse source 
These test cases were supposed to clear the cfg80211 and wpa_supplicant
scan caches in the end to avoid causing issues to the following test
cases. This did not work properly after introduction of the support for
aborting a pending scan. Fix this by using the flush_scan_cache()
function and waiting within the test case until the final scan operation
completes.

This issue was triggered by ssid_hidden/ssid_hidden2 followed by
ext_password_interworking (though, not every time).

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-12-20 12:59:19 +02:00
parent bfdb90d40f
commit 7c7234a583
1 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
tests/hwsim/test_ssid.py
View file

@ -60,6 +60,15 @@ def test_ssid_utf8(dev, apdev):
if len(sta3) != 0: if len(sta3) != 0:
raise Exception("Unexpected STA iteration result (did not stop)") raise Exception("Unexpected STA iteration result (did not stop)")
def clear_scan_cache(hapd, dev):
# clear BSS table to avoid issues in following test cases
dev[0].request("REMOVE_NETWORK all")
dev[1].request("REMOVE_NETWORK all")
dev[0].wait_disconnected()
hapd.disable()
dev[0].flush_scan_cache()
dev[1].flush_scan_cache()
def test_ssid_hidden(dev, apdev): def test_ssid_hidden(dev, apdev):
"""Hidden SSID""" """Hidden SSID"""
hapd = hostapd.add_ap(apdev[0]['ifname'], { "ssid": 'secret', hapd = hostapd.add_ap(apdev[0]['ifname'], { "ssid": 'secret',
@ -70,14 +79,7 @@ def test_ssid_hidden(dev, apdev):
ev = dev[1].wait_event(["CTRL-EVENT-CONNECTED"], timeout=1) ev = dev[1].wait_event(["CTRL-EVENT-CONNECTED"], timeout=1)
if ev is not None: if ev is not None:
raise Exception("Unexpected connection") raise Exception("Unexpected connection")
dev[0].request("DISCONNECT") clear_scan_cache(hapd, dev)
dev[1].request("DISCONNECT")
# clear BSS table to avoid issues in following test cases
hapd.disable()
dev[0].request("BSS_FLUSH 0")
dev[0].request("SCAN freq=2412 only_new=1")
dev[1].request("BSS_FLUSH 0")
dev[1].request("SCAN freq=2412 only_new=1")
def test_ssid_hidden2(dev, apdev): def test_ssid_hidden2(dev, apdev):
"""Hidden SSID using zero octets as payload""" """Hidden SSID using zero octets as payload"""
@ -89,14 +91,7 @@ def test_ssid_hidden2(dev, apdev):
ev = dev[1].wait_event(["CTRL-EVENT-CONNECTED"], timeout=1) ev = dev[1].wait_event(["CTRL-EVENT-CONNECTED"], timeout=1)
if ev is not None: if ev is not None:
raise Exception("Unexpected connection") raise Exception("Unexpected connection")
dev[0].request("DISCONNECT") clear_scan_cache(hapd, dev)
dev[1].request("DISCONNECT")
# clear BSS table to avoid issues in following test cases
hapd.disable()
dev[0].request("BSS_FLUSH 0")
dev[0].request("SCAN freq=2412 only_new=1")
dev[1].request("BSS_FLUSH 0")
dev[1].request("SCAN freq=2412 only_new=1")
def test_ssid_hidden_wpa2(dev, apdev): def test_ssid_hidden_wpa2(dev, apdev):
"""Hidden SSID with WPA2-PSK""" """Hidden SSID with WPA2-PSK"""
@ -109,11 +104,4 @@ def test_ssid_hidden_wpa2(dev, apdev):
ev = dev[1].wait_event(["CTRL-EVENT-CONNECTED"], timeout=1) ev = dev[1].wait_event(["CTRL-EVENT-CONNECTED"], timeout=1)
if ev is not None: if ev is not None:
raise Exception("Unexpected connection") raise Exception("Unexpected connection")
dev[0].request("DISCONNECT") clear_scan_cache(hapd, dev)
dev[1].request("DISCONNECT")
# clear BSS table to avoid issues in following test cases
hapd.disable()
dev[0].request("BSS_FLUSH 0")
dev[0].request("SCAN freq=2412 only_new=1")
dev[1].request("BSS_FLUSH 0")
dev[1].request("SCAN freq=2412 only_new=1")