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

tests: Clear sae_groups to default value in forgotten cases

Browse source 
It was possible for some of the SAE test cases (e.g., ap_ft_sae) to fail
if they were run after the sae_groups test case that left the SAE group
configuration to a value that is not enabled by default. Fix this by
clearing sae_groups setting in the couple of test cases that were not
yet doing this.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-11-25 15:19:19 +02:00
parent 7c8f5ea6a0
commit 17ffdf3951
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/hwsim/test_ap_ft.py
View file

@ -263,6 +263,7 @@ def test_ap_ft_sae(dev, apdev):
if key_mgmt.split(' ')[0] != "FT-SAE": if key_mgmt.split(' ')[0] != "FT-SAE":
raise Exception("Unexpected GET_CONFIG(key_mgmt): " + key_mgmt) raise Exception("Unexpected GET_CONFIG(key_mgmt): " + key_mgmt)
dev[0].request("SET sae_groups ")
run_roams(dev[0], apdev, hapd0, hapd, ssid, passphrase, sae=True) run_roams(dev[0], apdev, hapd0, hapd, ssid, passphrase, sae=True)
def test_ap_ft_sae_over_ds(dev, apdev): def test_ap_ft_sae_over_ds(dev, apdev):
@ -277,6 +278,7 @@ def test_ap_ft_sae_over_ds(dev, apdev):
params['wpa_key_mgmt'] = "FT-SAE" params['wpa_key_mgmt'] = "FT-SAE"
hapd1 = hostapd.add_ap(apdev[1]['ifname'], params) hapd1 = hostapd.add_ap(apdev[1]['ifname'], params)
dev[0].request("SET sae_groups ")
run_roams(dev[0], apdev, hapd0, hapd1, ssid, passphrase, sae=True, run_roams(dev[0], apdev, hapd0, hapd1, ssid, passphrase, sae=True,
over_ds=True) over_ds=True)

4
tests/hwsim/test_wpas_mesh.py
View file

@ -267,6 +267,7 @@ def test_wpas_mesh_open_no_auto(dev, apdev):
def _test_wpas_mesh_secure(dev, apdev, test_connectivity): def _test_wpas_mesh_secure(dev, apdev, test_connectivity):
"""wpa_supplicant secure MESH network connectivity""" """wpa_supplicant secure MESH network connectivity"""
dev[0].request("SET sae_groups ")
id = dev[0].add_network() id = dev[0].add_network()
dev[0].set_network(id, "mode", "5") dev[0].set_network(id, "mode", "5")
dev[0].set_network_quoted(id, "ssid", "wpas-mesh-sec") dev[0].set_network_quoted(id, "ssid", "wpas-mesh-sec")
@ -275,6 +276,7 @@ def _test_wpas_mesh_secure(dev, apdev, test_connectivity):
dev[0].set_network_quoted(id, "psk", "thisismypassphrase!") dev[0].set_network_quoted(id, "psk", "thisismypassphrase!")
dev[0].mesh_group_add(id) dev[0].mesh_group_add(id)
dev[1].request("SET sae_groups ")
id = dev[1].add_network() id = dev[1].add_network()
dev[1].set_network(id, "mode", "5") dev[1].set_network(id, "mode", "5")
dev[1].set_network_quoted(id, "ssid", "wpas-mesh-sec") dev[1].set_network_quoted(id, "ssid", "wpas-mesh-sec")
@ -302,6 +304,7 @@ def test_wpas_mesh_secure(dev, apdev):
def _test_wpas_mesh_secure_no_auto(dev, apdev, test_connectivity): def _test_wpas_mesh_secure_no_auto(dev, apdev, test_connectivity):
"""wpa_supplicant secure MESH network connectivity""" """wpa_supplicant secure MESH network connectivity"""
dev[0].request("SET sae_groups ")
id = dev[0].add_network() id = dev[0].add_network()
dev[0].set_network(id, "mode", "5") dev[0].set_network(id, "mode", "5")
dev[0].set_network_quoted(id, "ssid", "wpas-mesh-sec") dev[0].set_network_quoted(id, "ssid", "wpas-mesh-sec")
@ -310,6 +313,7 @@ def _test_wpas_mesh_secure_no_auto(dev, apdev, test_connectivity):
dev[0].set_network_quoted(id, "psk", "thisismypassphrase!") dev[0].set_network_quoted(id, "psk", "thisismypassphrase!")
dev[0].mesh_group_add(id) dev[0].mesh_group_add(id)
dev[1].request("SET sae_groups ")
id = dev[1].add_network() id = dev[1].add_network()
dev[1].set_network(id, "mode", "5") dev[1].set_network(id, "mode", "5")
dev[1].set_network_quoted(id, "ssid", "wpas-mesh-sec") dev[1].set_network_quoted(id, "ssid", "wpas-mesh-sec")