From 9f46d57f2b6b1fdb82d67c5ca8459a00609bf5f2 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Fri, 29 Mar 2013 17:19:47 +0200
Subject: [PATCH] tests: Rename AP testing scripts to be more generic

Signed-hostap: Jouni Malinen <j@w1.fi>
---
 tests/hwsim/run-all.sh                                | 4 ++--
 tests/hwsim/{run-ap-wpa2-tests.py => run-ap-tests.py} | 2 +-
 tests/hwsim/{start-ap-wpa2-psk.sh => start-ap.sh}     | 0
 tests/hwsim/{test_ap_wpa2.py => test_ap_tdls.py}      | 7 +------
 4 files changed, 4 insertions(+), 9 deletions(-)
 rename tests/hwsim/{run-ap-wpa2-tests.py => run-ap-tests.py} (97%)
 rename tests/hwsim/{start-ap-wpa2-psk.sh => start-ap.sh} (100%)
 rename tests/hwsim/{test_ap_wpa2.py => test_ap_tdls.py} (97%)

diff --git a/tests/hwsim/run-all.sh b/tests/hwsim/run-all.sh
index 49376e6b0..fab475115 100755
--- a/tests/hwsim/run-all.sh
+++ b/tests/hwsim/run-all.sh
@@ -3,8 +3,8 @@
 errors=0
 ./start-p2p.sh
 ./run-p2p-tests.py || errors=1
-./start-ap-wpa2-psk.sh
-./run-ap-wpa2-tests.py || errors=1
+./start-ap.sh
+./run-ap-tests.py || errors=1
 ./stop-wifi.sh
 if [ $errors -gt 0 ]; then
     exit 1
diff --git a/tests/hwsim/run-ap-wpa2-tests.py b/tests/hwsim/run-ap-tests.py
similarity index 97%
rename from tests/hwsim/run-ap-wpa2-tests.py
rename to tests/hwsim/run-ap-tests.py
index 3a18cbf4e..96f823e75 100755
--- a/tests/hwsim/run-ap-wpa2-tests.py
+++ b/tests/hwsim/run-ap-tests.py
@@ -44,7 +44,7 @@ def main():
 
     tests = []
     for t in os.listdir("."):
-        m = re.match(r'(test_ap_wpa2.*)\.py$', t)
+        m = re.match(r'(test_ap_.*)\.py$', t)
         if m:
             print "Import test cases from " + t
             mod = __import__(m.group(1))
diff --git a/tests/hwsim/start-ap-wpa2-psk.sh b/tests/hwsim/start-ap.sh
similarity index 100%
rename from tests/hwsim/start-ap-wpa2-psk.sh
rename to tests/hwsim/start-ap.sh
diff --git a/tests/hwsim/test_ap_wpa2.py b/tests/hwsim/test_ap_tdls.py
similarity index 97%
rename from tests/hwsim/test_ap_wpa2.py
rename to tests/hwsim/test_ap_tdls.py
index 4b2ba7e30..44e687cc8 100644
--- a/tests/hwsim/test_ap_wpa2.py
+++ b/tests/hwsim/test_ap_tdls.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Tests with a WPA2-PSK AP
+# TDLS tests
 # Copyright (c) 2013, Jouni Malinen <j@w1.fi>
 #
 # 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[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):
     res = subprocess.check_output(["../../wlantest/wlantest_cli",
                                    "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)
 
 def add_tests(tests):
-    tests.append(test_ap_wpa2_psk_2sta)
     tests.append(test_ap_wpa2_tdls)
     tests.append(test_ap_wpa2_tdls_concurrent_init)
     tests.append(test_ap_wpa2_tdls_concurrent_init2)