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

tests: Avoid exception string matching for failures

Browse source 
Future commits change the related code and exception string. Avoiding
using the context is easy here and actually avoids two layers of
nesting.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
This commit is contained in:
Benjamin Berg 2023-11-21 01:51:46 +02:00 committed by Jouni Malinen
parent 2c89ca9223
commit 6f2289b6b4
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/hwsim/test_ap_eap.py
View file

@ -3469,8 +3469,9 @@ def test_ap_wpa2_eap_eke_server_oom(dev, apdev):
dev[0].request("REMOVE_NETWORK all")
for count in range(1, 1000):
try:
with alloc_fail(hapd, count, "eap_server_sm_step"):
# Fail on allocation number "count"
hapd.request("TEST_ALLOC_FAIL %d:eap_server_sm_step" % count)
dev[0].connect("test-wpa2-eap",
key_mgmt="WPA-EAP WPA-EAP-SHA256",
eap="EKE", identity="eke user", password=pw,
@ -3481,14 +3482,19 @@ def test_ap_wpa2_eap_eke_server_oom(dev, apdev):
time.sleep(0.1)
if hapd.request("GET_ALLOC_FAIL").startswith('0'):
break
else:
# Last iteration had no failure
# i.e. we exceeded the number of allocations
dev[0].request("REMOVE_NETWORK all")
except Exception as e:
if str(e) == "Allocation failure did not trigger":
if count < 30:
raise Exception("Too few allocation failures")
logger.info("%d allocation failures tested" % (count - 1))
break
raise e
else:
# All iterations had an allocation failure
hapd.request("TEST_ALLOC_FAIL 0:")
raise Exception("More than %d allocations, test aborted" % (count - 1))
if count < 30:
raise Exception("Too few allocation failures")
def test_ap_wpa2_eap_ikev2(dev, apdev):
"""WPA2-Enterprise connection using EAP-IKEv2"""