tests: Move check_sae_capa() into utils.py

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

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

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",

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"""

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"),

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: