From c4a8c173b8030cca292df16ba93c6504bb24f4f8 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 3 Oct 2014 11:41:32 +0300 Subject: [PATCH] Revert "tests: Skip ap_wpa2_tdls_concurrent_init on failure" This reverts commit bf700cc3d2431017e5911e4efb439c235b18ef5d. 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 --- tests/hwsim/test_ap_tdls.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/tests/hwsim/test_ap_tdls.py b/tests/hwsim/test_ap_tdls.py index 55f89f6a1..8c0f9f01c 100644 --- a/tests/hwsim/test_ap_tdls.py +++ b/tests/hwsim/test_ap_tdls.py @@ -101,7 +101,7 @@ def check_connectivity(sta0, sta1, ap): hwsim_utils.test_connectivity(sta0.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") check_connectivity(sta0, sta1, ap) bssid = ap['bssid'] @@ -118,12 +118,7 @@ def setup_tdls(sta0, sta1, ap, reverse=False, expect_fail=False, allow_skip=Fals if reverse: addr1 = sta0.p2p_interface_addr() addr0 = sta1.p2p_interface_addr() - try: - 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") + conf = wt.get_tdls_counter("setup_conf_ok", bssid, addr0, addr1); if conf == 0: raise Exception("No TDLS Setup Confirm (success) seen") tdls_check_dl(sta0, sta1, bssid, addr0, addr1) @@ -171,11 +166,7 @@ def test_ap_wpa2_tdls_concurrent_init(dev, apdev): wlantest_setup() connect_2sta_wpa2_psk(dev, apdev[0]['ifname']) dev[0].request("SET tdls_testing 0x80") - res = setup_tdls(dev[1], dev[0], apdev[0], reverse=True, allow_skip=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" + setup_tdls(dev[1], dev[0], apdev[0], reverse=True) def test_ap_wpa2_tdls_concurrent_init2(dev, apdev): """Concurrent TDLS setup initiation (reverse)"""