From 17ffdf39515c3fb20a902c7f308ad1cb82c6ceb9 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Tue, 25 Nov 2014 15:19:19 +0200 Subject: [PATCH] tests: Clear sae_groups to default value in forgotten cases 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 --- tests/hwsim/test_ap_ft.py | 2 ++ tests/hwsim/test_wpas_mesh.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/tests/hwsim/test_ap_ft.py b/tests/hwsim/test_ap_ft.py index 04bc529a7..eb6a3937c 100644 --- a/tests/hwsim/test_ap_ft.py +++ b/tests/hwsim/test_ap_ft.py @@ -263,6 +263,7 @@ def test_ap_ft_sae(dev, apdev): if key_mgmt.split(' ')[0] != "FT-SAE": 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) 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" 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, over_ds=True) diff --git a/tests/hwsim/test_wpas_mesh.py b/tests/hwsim/test_wpas_mesh.py index c5eea7210..d4042895e 100644 --- a/tests/hwsim/test_wpas_mesh.py +++ b/tests/hwsim/test_wpas_mesh.py @@ -267,6 +267,7 @@ def test_wpas_mesh_open_no_auto(dev, apdev): def _test_wpas_mesh_secure(dev, apdev, test_connectivity): """wpa_supplicant secure MESH network connectivity""" + dev[0].request("SET sae_groups ") id = dev[0].add_network() dev[0].set_network(id, "mode", "5") 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].mesh_group_add(id) + dev[1].request("SET sae_groups ") id = dev[1].add_network() dev[1].set_network(id, "mode", "5") 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): """wpa_supplicant secure MESH network connectivity""" + dev[0].request("SET sae_groups ") id = dev[0].add_network() dev[0].set_network(id, "mode", "5") 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].mesh_group_add(id) + dev[1].request("SET sae_groups ") id = dev[1].add_network() dev[1].set_network(id, "mode", "5") dev[1].set_network_quoted(id, "ssid", "wpas-mesh-sec")