DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: Rename AP testing scripts to be more generic

Browse source 
Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-03-29 17:19:47 +02:00
parent 187f87f04c
commit 9f46d57f2b
4 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/hwsim/run-all.sh
View file

@ -3,8 +3,8 @@
errors=0 errors=0
./start-p2p.sh ./start-p2p.sh
./run-p2p-tests.py || errors=1 ./run-p2p-tests.py || errors=1
./start-ap-wpa2-psk.sh ./start-ap.sh
./run-ap-wpa2-tests.py || errors=1 ./run-ap-tests.py || errors=1
./stop-wifi.sh ./stop-wifi.sh
if [ $errors -gt 0 ]; then if [ $errors -gt 0 ]; then
exit 1 exit 1

2
tests/hwsim/run-ap-wpa2-tests.py → tests/hwsim/run-ap-tests.py
View file

@ -44,7 +44,7 @@ def main():
tests = [] tests = []
for t in os.listdir("."): for t in os.listdir("."):
m = re.match(r'(test_ap_wpa2.*)\.py$', t) m = re.match(r'(test_ap_.*)\.py$', t)
if m: if m:
print "Import test cases from " + t print "Import test cases from " + t
mod = __import__(m.group(1)) mod = __import__(m.group(1))

0
tests/hwsim/start-ap-wpa2-psk.sh → tests/hwsim/start-ap.sh
View file

7
tests/hwsim/test_ap_wpa2.py → tests/hwsim/test_ap_tdls.py
View file

@ -1,6 +1,6 @@
#!/usr/bin/python #!/usr/bin/python
# #
# Tests with a WPA2-PSK AP # TDLS tests
# Copyright (c) 2013, Jouni Malinen <j@w1.fi> # Copyright (c) 2013, Jouni Malinen <j@w1.fi>
# #
# This software may be distributed under the terms of the BSD license. # This software may be distributed under the terms of the BSD license.
@ -27,10 +27,6 @@ def connect_2sta(dev):
hwsim_utils.test_connectivity(dev[0].ifname, "wlan2") hwsim_utils.test_connectivity(dev[0].ifname, "wlan2")
hwsim_utils.test_connectivity(dev[1].ifname, "wlan2") hwsim_utils.test_connectivity(dev[1].ifname, "wlan2")
def test_ap_wpa2_psk_2sta(dev):
"""WPA2-PSK AP and two stations"""
connect_2sta(dev)
def wlantest_tdls(field, bssid, addr1, addr2): def wlantest_tdls(field, bssid, addr1, addr2):
res = subprocess.check_output(["../../wlantest/wlantest_cli", res = subprocess.check_output(["../../wlantest/wlantest_cli",
"get_tdls_counter", field, bssid, addr1, "get_tdls_counter", field, bssid, addr1,
@ -190,7 +186,6 @@ def test_ap_wpa2_tdls_diff_rsnie(dev):
teardown_tdls(dev[1], dev[0], bssid) teardown_tdls(dev[1], dev[0], bssid)
def add_tests(tests): def add_tests(tests):
tests.append(test_ap_wpa2_psk_2sta)
tests.append(test_ap_wpa2_tdls) tests.append(test_ap_wpa2_tdls)
tests.append(test_ap_wpa2_tdls_concurrent_init) tests.append(test_ap_wpa2_tdls_concurrent_init)
tests.append(test_ap_wpa2_tdls_concurrent_init2) tests.append(test_ap_wpa2_tdls_concurrent_init2)