X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=blobdiff_plain;f=libeap%2Ftests%2Fhwsim%2Ftest_ssid.py;fp=libeap%2Ftests%2Fhwsim%2Ftest_ssid.py;h=738c7828bfedcd71cdd57e51ac267d8e77a4af94;hp=ca0479e216d77a4cc936242e34e1dd2cbcab7889;hb=d1dd9aae6741e74f20bfc35e1db598652680279d;hpb=bd3bd69af16ab99706ba70ed11a3e291e968e5c6 diff --git a/libeap/tests/hwsim/test_ssid.py b/libeap/tests/hwsim/test_ssid.py index ca0479e..738c782 100644 --- a/libeap/tests/hwsim/test_ssid.py +++ b/libeap/tests/hwsim/test_ssid.py @@ -5,20 +5,22 @@ # This software may be distributed under the terms of the BSD license. # See README for more details. +from remotehost import remote_compatible import logging logger = logging.getLogger() import hostapd +@remote_compatible def test_ssid_hex_encoded(dev, apdev): """SSID configuration using hex encoded version""" - hostapd.add_ap(apdev[0]['ifname'], { "ssid2": '68656c6c6f' }) + hostapd.add_ap(apdev[0], { "ssid2": '68656c6c6f' }) dev[0].connect("hello", key_mgmt="NONE", scan_freq="2412") dev[1].connect(ssid2="68656c6c6f", key_mgmt="NONE", scan_freq="2412") def test_ssid_printf_encoded(dev, apdev): """SSID configuration using printf encoded version""" - hostapd.add_ap(apdev[0]['ifname'], { "ssid2": 'P"\\0hello\\nthere"' }) + hostapd.add_ap(apdev[0], { "ssid2": 'P"\\0hello\\nthere"' }) dev[0].connect(ssid2="0068656c6c6f0a7468657265", key_mgmt="NONE", scan_freq="2412") dev[1].connect(ssid2='P"\\x00hello\\nthere"', key_mgmt="NONE", @@ -29,22 +31,25 @@ def test_ssid_printf_encoded(dev, apdev): raise Exception("Unexpected difference in SSID") dev[2].connect(ssid2='P"' + ssid + '"', key_mgmt="NONE", scan_freq="2412") +@remote_compatible def test_ssid_1_octet(dev, apdev): """SSID with one octet""" - hostapd.add_ap(apdev[0]['ifname'], { "ssid": '1' }) + hostapd.add_ap(apdev[0], { "ssid": '1' }) dev[0].connect("1", key_mgmt="NONE", scan_freq="2412") +@remote_compatible def test_ssid_32_octets(dev, apdev): """SSID with 32 octets""" - hostapd.add_ap(apdev[0]['ifname'], + hostapd.add_ap(apdev[0], { "ssid": '1234567890abcdef1234567890ABCDEF' }) dev[0].connect("1234567890abcdef1234567890ABCDEF", key_mgmt="NONE", scan_freq="2412") +@remote_compatible def test_ssid_utf8(dev, apdev): """SSID with UTF8 encoding""" - hapd = hostapd.add_ap(apdev[0]['ifname'], { "ssid": 'testi-åäöÅÄÖ-testi', - "utf8_ssid": "1" }) + hapd = hostapd.add_ap(apdev[0], { "ssid": 'testi-åäöÅÄÖ-testi', + "utf8_ssid": "1" }) dev[0].connect("testi-åäöÅÄÖ-testi", key_mgmt="NONE", scan_freq="2412") dev[1].connect(ssid2="74657374692dc3a5c3a4c3b6c385c384c3962d7465737469", key_mgmt="NONE", scan_freq="2412") @@ -60,60 +65,51 @@ def test_ssid_utf8(dev, apdev): if len(sta3) != 0: raise Exception("Unexpected STA iteration result (did not stop)") +def clear_scan_cache(hapd, dev): + # clear BSS table to avoid issues in following test cases + dev[0].request("REMOVE_NETWORK all") + dev[1].request("REMOVE_NETWORK all") + dev[0].wait_disconnected() + hapd.disable() + dev[0].flush_scan_cache() + dev[1].flush_scan_cache() + +@remote_compatible def test_ssid_hidden(dev, apdev): """Hidden SSID""" - hapd = hostapd.add_ap(apdev[0]['ifname'], { "ssid": 'secret', - "ignore_broadcast_ssid": "1" }) + hapd = hostapd.add_ap(apdev[0], { "ssid": 'secret', + "ignore_broadcast_ssid": "1" }) dev[1].connect("secret", key_mgmt="NONE", scan_freq="2412", wait_connect=False) dev[0].connect("secret", key_mgmt="NONE", scan_freq="2412", scan_ssid="1") ev = dev[1].wait_event(["CTRL-EVENT-CONNECTED"], timeout=1) if ev is not None: raise Exception("Unexpected connection") - dev[0].request("DISCONNECT") - dev[1].request("DISCONNECT") - # clear BSS table to avoid issues in following test cases - hapd.disable() - dev[0].request("BSS_FLUSH 0") - dev[0].request("SCAN freq=2412 only_new=1") - dev[1].request("BSS_FLUSH 0") - dev[1].request("SCAN freq=2412 only_new=1") + clear_scan_cache(hapd, dev) +@remote_compatible def test_ssid_hidden2(dev, apdev): """Hidden SSID using zero octets as payload""" - hapd = hostapd.add_ap(apdev[0]['ifname'], { "ssid": 'secret2', - "ignore_broadcast_ssid": "2" }) + hapd = hostapd.add_ap(apdev[0], { "ssid": 'secret2', + "ignore_broadcast_ssid": "2" }) dev[1].connect("secret2", key_mgmt="NONE", scan_freq="2412", wait_connect=False) dev[0].connect("secret2", key_mgmt="NONE", scan_freq="2412", scan_ssid="1") ev = dev[1].wait_event(["CTRL-EVENT-CONNECTED"], timeout=1) if ev is not None: raise Exception("Unexpected connection") - dev[0].request("DISCONNECT") - dev[1].request("DISCONNECT") - # clear BSS table to avoid issues in following test cases - hapd.disable() - dev[0].request("BSS_FLUSH 0") - dev[0].request("SCAN freq=2412 only_new=1") - dev[1].request("BSS_FLUSH 0") - dev[1].request("SCAN freq=2412 only_new=1") + clear_scan_cache(hapd, dev) +@remote_compatible def test_ssid_hidden_wpa2(dev, apdev): """Hidden SSID with WPA2-PSK""" params = hostapd.wpa2_params(ssid="secret", passphrase="12345678") params["ignore_broadcast_ssid"] = "1" - hapd = hostapd.add_ap(apdev[0]['ifname'], params) + hapd = hostapd.add_ap(apdev[0], params) dev[1].connect("secret", psk="12345678", scan_freq="2412", wait_connect=False) dev[0].connect("secret", psk="12345678", scan_freq="2412", scan_ssid="1") ev = dev[1].wait_event(["CTRL-EVENT-CONNECTED"], timeout=1) if ev is not None: raise Exception("Unexpected connection") - dev[0].request("DISCONNECT") - dev[1].request("DISCONNECT") - # clear BSS table to avoid issues in following test cases - hapd.disable() - dev[0].request("BSS_FLUSH 0") - dev[0].request("SCAN freq=2412 only_new=1") - dev[1].request("BSS_FLUSH 0") - dev[1].request("SCAN freq=2412 only_new=1") + clear_scan_cache(hapd, dev)