DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: Split ap_ft_oom into separate test cases

Browse source 
ap_ft_oom seemed to depend on undesired wpa_supplicant behavior of
trying to do FT protocol even without being ready for reassociation.
This is going to be fixed in wpa_supplicant which would make this test
case fail, so split it into separate test cases for each failure item to
be able to avoid incorrect test failures.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-01-04 23:19:30 +02:00
parent 04e17e5024
commit 63a7683b2d
2 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
tests/hwsim/test_ap_ft.py
View file

@ -1389,8 +1389,7 @@ def test_ap_ft_gcmp_256(dev, apdev):
run_roams(dev[0], apdev, hapd0, hapd1, ssid, passphrase, run_roams(dev[0], apdev, hapd0, hapd1, ssid, passphrase,
pairwise_cipher="GCMP-256", group_cipher="GCMP-256") pairwise_cipher="GCMP-256", group_cipher="GCMP-256")
def test_ap_ft_oom(dev, apdev): def setup_ap_ft_oom(dev, apdev):
"""WPA2-PSK-FT and OOM"""
skip_with_fips(dev[0]) skip_with_fips(dev[0])
ssid = "test-ft" ssid = "test-ft"
passphrase="12345678" passphrase="12345678"
@ -1408,13 +1407,32 @@ def test_ap_ft_oom(dev, apdev):
dst = apdev[0]['bssid'] dst = apdev[0]['bssid']
dev[0].scan_for_bss(dst, freq="2412") dev[0].scan_for_bss(dst, freq="2412")
return dst
def test_ap_ft_oom(dev, apdev):
"""WPA2-PSK-FT and OOM"""
dst = setup_ap_ft_oom(dev, apdev)
with alloc_fail(dev[0], 1, "wpa_ft_gen_req_ies"): with alloc_fail(dev[0], 1, "wpa_ft_gen_req_ies"):
dev[0].roam(dst) dev[0].roam(dst)
with fail_test(dev[0], 1, "wpa_ft_mic"):
dev[0].roam(dst, fail_test=True)
with fail_test(dev[0], 1, "os_get_random;wpa_ft_prepare_auth_request"):
dev[0].roam(dst, fail_test=True)
def test_ap_ft_oom2(dev, apdev):
"""WPA2-PSK-FT and OOM (2)"""
dst = setup_ap_ft_oom(dev, apdev)
with fail_test(dev[0], 1, "wpa_ft_mic"):
dev[0].roam(dst, fail_test=True, assoc_reject_ok=True)
def test_ap_ft_oom3(dev, apdev):
"""WPA2-PSK-FT and OOM (3)"""
dst = setup_ap_ft_oom(dev, apdev)
with fail_test(dev[0], 1, "os_get_random;wpa_ft_prepare_auth_request"):
dev[0].roam(dst)
def test_ap_ft_oom4(dev, apdev):
"""WPA2-PSK-FT and OOM (4)"""
ssid = "test-ft"
passphrase="12345678"
dst = setup_ap_ft_oom(dev, apdev)
dev[0].request("REMOVE_NETWORK all") dev[0].request("REMOVE_NETWORK all")
with alloc_fail(dev[0], 1, "=sme_update_ft_ies"): with alloc_fail(dev[0], 1, "=sme_update_ft_ies"):
dev[0].connect(ssid, psk=passphrase, key_mgmt="FT-PSK", proto="WPA2", dev[0].connect(ssid, psk=passphrase, key_mgmt="FT-PSK", proto="WPA2",

10
tests/hwsim/wpasupplicant.py
View file

@ -1106,13 +1106,17 @@ class WpaSupplicant:
if len(res.splitlines()) > 1: if len(res.splitlines()) > 1:
logger.info("flush_scan_cache: Could not clear all BSS entries. These remain:\n" + res) logger.info("flush_scan_cache: Could not clear all BSS entries. These remain:\n" + res)
def roam(self, bssid, fail_test=False): def roam(self, bssid, fail_test=False, assoc_reject_ok=False):
self.dump_monitor() self.dump_monitor()
if "OK" not in self.request("ROAM " + bssid): if "OK" not in self.request("ROAM " + bssid):
raise Exception("ROAM failed") raise Exception("ROAM failed")
if fail_test: if fail_test:
ev = self.wait_event(["CTRL-EVENT-CONNECTED"], timeout=1) if assoc_reject_ok:
if ev is not None: ev = self.wait_event(["CTRL-EVENT-CONNECTED",
"CTRL-EVENT-ASSOC-REJECT"], timeout=1)
else:
ev = self.wait_event(["CTRL-EVENT-CONNECTED"], timeout=1)
if ev is not None and "CTRL-EVENT-ASSOC-REJECT" not in ev:
raise Exception("Unexpected connection") raise Exception("Unexpected connection")
self.dump_monitor() self.dump_monitor()
return return