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

Revert "tests: Skip ap_wpa2_tdls_concurrent_init on failure"

Browse source 
This reverts commit bf700cc3d2. The
concurrent initialization test case is now expected to work again with
the STA entry added early enough to avoid the recently added mac80211
validation step failure.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-10-03 11:41:32 +03:00
parent 77835ae9dd
commit c4a8c173b8
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/hwsim/test_ap_tdls.py
View file

@ -101,7 +101,7 @@ def check_connectivity(sta0, sta1, ap):
hwsim_utils.test_connectivity(sta0.ifname, ap['ifname']) hwsim_utils.test_connectivity(sta0.ifname, ap['ifname'])
hwsim_utils.test_connectivity(sta1.ifname, ap['ifname']) hwsim_utils.test_connectivity(sta1.ifname, ap['ifname'])
def setup_tdls(sta0, sta1, ap, reverse=False, expect_fail=False, allow_skip=False): def setup_tdls(sta0, sta1, ap, reverse=False, expect_fail=False):
logger.info("Setup TDLS") logger.info("Setup TDLS")
check_connectivity(sta0, sta1, ap) check_connectivity(sta0, sta1, ap)
bssid = ap['bssid'] bssid = ap['bssid']
@ -118,12 +118,7 @@ def setup_tdls(sta0, sta1, ap, reverse=False, expect_fail=False, allow_skip=Fals
if reverse: if reverse:
addr1 = sta0.p2p_interface_addr() addr1 = sta0.p2p_interface_addr()
addr0 = sta1.p2p_interface_addr() addr0 = sta1.p2p_interface_addr()
try:
conf = wt.get_tdls_counter("setup_conf_ok", bssid, addr0, addr1); conf = wt.get_tdls_counter("setup_conf_ok", bssid, addr0, addr1);
except:
if allow_skip:
return "skip"
raise Exception("Could not get setup_conf_ok counter from wlantest")
if conf == 0: if conf == 0:
raise Exception("No TDLS Setup Confirm (success) seen") raise Exception("No TDLS Setup Confirm (success) seen")
tdls_check_dl(sta0, sta1, bssid, addr0, addr1) tdls_check_dl(sta0, sta1, bssid, addr0, addr1)
@ -171,11 +166,7 @@ def test_ap_wpa2_tdls_concurrent_init(dev, apdev):
wlantest_setup() wlantest_setup()
connect_2sta_wpa2_psk(dev, apdev[0]['ifname']) connect_2sta_wpa2_psk(dev, apdev[0]['ifname'])
dev[0].request("SET tdls_testing 0x80") dev[0].request("SET tdls_testing 0x80")
res = setup_tdls(dev[1], dev[0], apdev[0], reverse=True, allow_skip=True) setup_tdls(dev[1], dev[0], apdev[0], reverse=True)
if res == "skip":
# mac80211 validation change ended up breaking this test functionality
logger.info("Assume kernel did not support concurrent TDLS init testing")
return "skip"
def test_ap_wpa2_tdls_concurrent_init2(dev, apdev): def test_ap_wpa2_tdls_concurrent_init2(dev, apdev):
"""Concurrent TDLS setup initiation (reverse)""" """Concurrent TDLS setup initiation (reverse)"""