tests: ap_tdls: Wait before connectivity checks

All processes need to have a bit of time to mark the kernel STAs
authorized, otherwise traffic may fail. Give them some time, and also
use check_connectivity() in connectivity() since it's the same check,
just different arguments.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2023-09-25 09:20:51 +02:00 committed by Jouni Malinen
parent f562fd014a
commit dbcaf927cd

View file

@ -22,9 +22,7 @@ def start_ap_wpa2_psk(ap):
return hostapd.add_ap(ap, params) return hostapd.add_ap(ap, params)
def connectivity(dev, hapd): def connectivity(dev, hapd):
hwsim_utils.test_connectivity_sta(dev[0], dev[1]) check_connectivity(dev[0], dev[1], hapd)
hwsim_utils.test_connectivity(dev[0], hapd)
hwsim_utils.test_connectivity(dev[1], hapd)
def connect_2sta(dev, ssid, hapd, sae=False): def connect_2sta(dev, ssid, hapd, sae=False):
key_mgmt = "SAE" if sae else "WPA-PSK" key_mgmt = "SAE" if sae else "WPA-PSK"
@ -112,6 +110,8 @@ def tdls_check_ap(sta0, sta1, bssid, addr0, addr1):
raise Exception("Invalid frames through AP path") raise Exception("Invalid frames through AP path")
def check_connectivity(sta0, sta1, hapd): def check_connectivity(sta0, sta1, hapd):
# give a bit of time for all sides to mark kernel STAs authorized
time.sleep(0.1)
hwsim_utils.test_connectivity_sta(sta0, sta1) hwsim_utils.test_connectivity_sta(sta0, sta1)
hwsim_utils.test_connectivity(sta0, hapd) hwsim_utils.test_connectivity(sta0, hapd)
hwsim_utils.test_connectivity(sta1, hapd) hwsim_utils.test_connectivity(sta1, hapd)
@ -358,6 +358,8 @@ def test_ap_wpa2_tdls_bssid_mismatch(dev, apdev):
bssid=apdev[0]['bssid']) bssid=apdev[0]['bssid'])
dev[1].connect(ssid, psk=passphrase, scan_freq="2412", dev[1].connect(ssid, psk=passphrase, scan_freq="2412",
bssid=apdev[1]['bssid']) bssid=apdev[1]['bssid'])
# give a bit of time for all sides to mark kernel STAs authorized
time.sleep(0.1)
hwsim_utils.test_connectivity_sta(dev[0], dev[1]) hwsim_utils.test_connectivity_sta(dev[0], dev[1])
hwsim_utils.test_connectivity_iface(dev[0], hapd, "ap-br0") hwsim_utils.test_connectivity_iface(dev[0], hapd, "ap-br0")
hwsim_utils.test_connectivity_iface(dev[1], hapd, "ap-br0") hwsim_utils.test_connectivity_iface(dev[1], hapd, "ap-br0")