tests: Move check_sae_capa() into utils.py

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/tests/hwsim/test_ap_acs.py b/tests/hwsim/test_ap_acs.py
index a5644195d9deda1c0a2fbff424f951c86bebe67f..1833c0fd8827440672e38e69adbcffb0e59ae317 100644 (file)
--- a/tests/hwsim/test_ap_acs.py
+++ b/tests/hwsim/test_ap_acs.py
@@ -12,7 +12,6 @@ import hostapd
 from utils import *
 from test_ap_ht import clear_scan_cache
 from test_dfs import wait_dfs_event
-from test_sae import check_sae_capab
 
 def force_prev_ap_on_24g(ap):
     # For now, make sure the last operating channel was on 2.4 GHz band to get

diff --git a/tests/hwsim/test_ap_wps.py b/tests/hwsim/test_ap_wps.py
index c8514b260b25f9122e371a596882e1cbf591d2e5..0ecf2961fe3ff3d33da107f9290965e25164fe95 100644 (file)
--- a/tests/hwsim/test_ap_wps.py
+++ b/tests/hwsim/test_ap_wps.py
@@ -43,7 +43,6 @@ import hostapd
 from wpasupplicant import WpaSupplicant
 from utils import *
 from test_ap_eap import int_eap_server_params
-from test_sae import check_sae_capab
 
 def wps_start_ap(apdev, ssid="test-wps-conf"):
     params = {"ssid": ssid, "eap_server": "1", "wps_state": "2",

diff --git a/tests/hwsim/test_sae.py b/tests/hwsim/test_sae.py
index 63a61b8f0f14bae2f2dd23e357cc3b2eead3cc0d..ed6ae89dc1b1337a03f137486b1dafdff6047f25 100644 (file)
--- a/tests/hwsim/test_sae.py
+++ b/tests/hwsim/test_sae.py
@@ -17,13 +17,9 @@ import subprocess
 import hwsim_utils
 import hostapd
 from wpasupplicant import WpaSupplicant
-from utils import HwsimSkip, alloc_fail, fail_test, wait_fail_trigger, start_monitor, stop_monitor, radiotap_build
+from utils import *
 from test_ap_psk import find_wpas_process, read_process_memory, verify_not_present, get_key_locations
 
-def check_sae_capab(dev):
-    if "SAE" not in dev.get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
-
 @remote_compatible
 def test_sae(dev, apdev):
     """SAE with default group"""

diff --git a/tests/hwsim/test_wpas_config.py b/tests/hwsim/test_wpas_config.py
index 14816a0e1250724eba62b172b7bd0ba30db9e09b..6bf62d0b7a22c805caefedb208b6b85f15e83021 100644 (file)
--- a/tests/hwsim/test_wpas_config.py
+++ b/tests/hwsim/test_wpas_config.py
@@ -10,7 +10,7 @@ import os
 
 from wpasupplicant import WpaSupplicant
 import hostapd
-from test_sae import check_sae_capab
+from utils import *
 
 config_checks = [("ap_scan", "0"),
                  ("update_config", "1"),

diff --git a/tests/hwsim/utils.py b/tests/hwsim/utils.py
index ee2f3ee1296d1abfc147ddeb153212af7f22b9be..7f50ab25e6f94b26daf38b1321feef6b5b2f6501 100644 (file)
--- a/tests/hwsim/utils.py
+++ b/tests/hwsim/utils.py
@@ -108,6 +108,10 @@ def check_wep_capa(dev):
     if "WEP40" not in dev.get_capability("group"):
         raise HwsimSkip("WEP not supported")
 
+def check_sae_capab(dev):
+    if "SAE" not in dev.get_capability("auth_alg"):
+        raise HwsimSkip("SAE not supported")
+
 def get_phy(ap, ifname=None):
     phy = "phy3"
     try: