diff --git a/autotests/testAP-no-support/test.py b/autotests/testAP-no-support/connection_test.py similarity index 100% rename from autotests/testAP-no-support/test.py rename to autotests/testAP-no-support/connection_test.py diff --git a/autotests/testAP/test.py b/autotests/testAP/connection_test.py similarity index 94% rename from autotests/testAP/test.py rename to autotests/testAP/connection_test.py index 4cacf9ad..36302da1 100644 --- a/autotests/testAP/test.py +++ b/autotests/testAP/connection_test.py @@ -3,17 +3,17 @@ import unittest import sys, os -sys.path.append('../util') import iwd from iwd import IWD from iwd import PSKAgent from iwd import NetworkType -import hostapd +from hostapd import HostapdCLI import testutil class Test(unittest.TestCase): def client_connect(self, wd, dev): + hostapd = HostapdCLI(config='psk-ccmp.conf') ordered_network = dev.get_ordered_network('TestAP1', True) @@ -30,8 +30,7 @@ class Test(unittest.TestCase): wd.unregister_psk_agent(psk_agent) testutil.test_iface_operstate(dev.name) - testutil.test_ifaces_connected(list(hostapd.hostapd_map.keys())[0], - dev.name) + testutil.test_ifaces_connected(hostapd.ifname, dev.name) dev.disconnect() @@ -57,6 +56,7 @@ class Test(unittest.TestCase): wd.wait_for_object_condition(dev2, condition) ordered_networks = dev2.get_ordered_networks() + networks = { n.name: n for n in ordered_networks } self.assertEqual(networks['TestAP1'].type, NetworkType.psk) self.assertEqual(networks['TestAP2'].type, NetworkType.psk) @@ -66,6 +66,7 @@ class Test(unittest.TestCase): try: dev2.disconnect() + condition = 'not obj.connected' wd.wait_for_object_condition(dev2, condition) except: diff --git a/autotests/testAP/failure_test.py b/autotests/testAP/failure_test.py index d30bccb4..a2622f45 100644 --- a/autotests/testAP/failure_test.py +++ b/autotests/testAP/failure_test.py @@ -8,12 +8,13 @@ import iwd from iwd import IWD from iwd import PSKAgent from iwd import NetworkType -import hostapd +from hostapd import HostapdCLI import testutil class Test(unittest.TestCase): def client_connect(self, wd, dev): + hostapd = HostapdCLI(config='psk-ccmp.conf') ordered_network = dev.get_ordered_network('TestAP1', True) @@ -30,8 +31,7 @@ class Test(unittest.TestCase): wd.unregister_psk_agent(psk_agent) testutil.test_iface_operstate(dev.name) - testutil.test_ifaces_connected(list(hostapd.hostapd_map.keys())[0], - dev.name) + testutil.test_ifaces_connected(hostapd.ifname, dev.name) dev.disconnect() diff --git a/autotests/testAPRoam/connection_test.py b/autotests/testAPRoam/connection_test.py index 292754c9..c8c2ca9f 100644 --- a/autotests/testAPRoam/connection_test.py +++ b/autotests/testAPRoam/connection_test.py @@ -10,8 +10,6 @@ from iwd import PSKAgent from iwd import NetworkType from hostapd import HostapdCLI -from hostapd import hostapd_map - from hwsim import Hwsim class Test(unittest.TestCase): diff --git a/autotests/testBSSBlacklist/all_blacklisted_test.py b/autotests/testBSSBlacklist/all_blacklisted_test.py index 78239309..099804a8 100644 --- a/autotests/testBSSBlacklist/all_blacklisted_test.py +++ b/autotests/testBSSBlacklist/all_blacklisted_test.py @@ -10,12 +10,8 @@ from iwd import PSKAgent from iwd import NetworkType from hostapd import HostapdCLI -from hostapd import hostapd_map - from hwsim import Hwsim -import time - class Test(unittest.TestCase): def test_connection_success(self): diff --git a/autotests/testBSSBlacklist/bad_pass_test.py b/autotests/testBSSBlacklist/bad_pass_test.py index 3516f3be..220ffcc8 100644 --- a/autotests/testBSSBlacklist/bad_pass_test.py +++ b/autotests/testBSSBlacklist/bad_pass_test.py @@ -10,12 +10,8 @@ from iwd import PSKAgent from iwd import NetworkType from hostapd import HostapdCLI -from hostapd import hostapd_map - from hwsim import Hwsim -import time - class Test(unittest.TestCase): def test_connection_success(self): diff --git a/autotests/testBSSBlacklist/connection_test.py b/autotests/testBSSBlacklist/connection_test.py index 7433d5f3..825439d4 100644 --- a/autotests/testBSSBlacklist/connection_test.py +++ b/autotests/testBSSBlacklist/connection_test.py @@ -10,7 +10,6 @@ from iwd import PSKAgent from iwd import NetworkType from hostapd import HostapdCLI -from hostapd import hostapd_map from hwsim import Hwsim diff --git a/autotests/testBSSBlacklist/temp_blacklist_test.py b/autotests/testBSSBlacklist/temp_blacklist_test.py index f43f807c..b2b57035 100644 --- a/autotests/testBSSBlacklist/temp_blacklist_test.py +++ b/autotests/testBSSBlacklist/temp_blacklist_test.py @@ -10,12 +10,8 @@ from iwd import PSKAgent from iwd import NetworkType from hostapd import HostapdCLI -from hostapd import hostapd_map - from hwsim import Hwsim -import time - class Test(unittest.TestCase): def test_connection_success(self): diff --git a/autotests/testClientNonInteractive/connect_command_test.py b/autotests/testClientNonInteractive/connect_command_test.py index 494f05d2..886d7a76 100644 --- a/autotests/testClientNonInteractive/connect_command_test.py +++ b/autotests/testClientNonInteractive/connect_command_test.py @@ -12,29 +12,25 @@ import subprocess class Test(unittest.TestCase): def check_connection_success(self, ssid): - wd = IWD() - - device = wd.list_devices(1)[0] + device = self.wd.list_devices(1)[0] condition = 'not obj.scanning' - wd.wait_for_object_condition(device, condition) + self.wd.wait_for_object_condition(device, condition) ordered_network = device.get_ordered_network(ssid) condition = 'obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + self.wd.wait_for_object_condition(ordered_network.network_object, condition) device.disconnect() condition = 'not obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + self.wd.wait_for_object_condition(ordered_network.network_object, condition) def test_connection_with_passphrase(self): ssid = 'ssidPassphrase' - wd = IWD() - - device = wd.list_devices(1)[0] + device = self.wd.list_devices(1)[0] # Use --dontaks cmd-line option with self.assertRaises(subprocess.CalledProcessError): @@ -49,9 +45,7 @@ class Test(unittest.TestCase): def test_connection_with_username_and_password(self): ssid = 'ssidUNameAndPWord' - wd = IWD() - - device = wd.list_devices(1)[0] + device = self.wd.list_devices(1)[0] subprocess.check_call(['iwctl', '-u', 'user', '-p', 'password', 'station', device.name, 'connect', ssid]) @@ -61,9 +55,7 @@ class Test(unittest.TestCase): def test_connection_with_password(self): ssid = 'ssidPWord' - wd = IWD() - - device = wd.list_devices(1)[0] + device = self.wd.list_devices(1)[0] subprocess.check_call(['iwctl', '-p', 'password', 'station', device.name, 'connect', ssid]) @@ -73,9 +65,7 @@ class Test(unittest.TestCase): def test_connection_failure(self): ssid = 'ssidPassphrase' - wd = IWD() - - device = wd.list_devices(1)[0] + device = self.wd.list_devices(1)[0] with self.assertRaises(subprocess.CalledProcessError): subprocess.check_call(['iwctl', '-P', 'incorrect_passphrase', @@ -84,18 +74,14 @@ class Test(unittest.TestCase): def test_invalid_command_line_option(self): ssid = 'ssidPassphrase' - wd = IWD() - - device = wd.list_devices(1)[0] + device = self.wd.list_devices(1)[0] with self.assertRaises(subprocess.CalledProcessError): subprocess.check_call(['iwctl', '-z', 'station', device.name, 'connect', ssid]) def test_invalid_command(self): - wd = IWD() - - device = wd.list_devices(1)[0] + device = self.wd.list_devices(1)[0] with self.assertRaises(subprocess.CalledProcessError): subprocess.check_call(['iwctl', 'inexistent', 'command']) @@ -105,17 +91,17 @@ class Test(unittest.TestCase): IWD.copy_to_storage('ssidUNameAndPWord.8021x') IWD.copy_to_storage('ssidPWord.8021x') - wd = IWD() + cls.wd = IWD() - device = wd.list_devices(1)[0] + device = cls.wd.list_devices(1)[0] condition = 'not obj.scanning' - wd.wait_for_object_condition(device, condition) + cls.wd.wait_for_object_condition(device, condition) device.scan() condition = 'not obj.scanning' - wd.wait_for_object_condition(device, condition) + cls.wd.wait_for_object_condition(device, condition) @classmethod def tearDownClass(cls): diff --git a/autotests/testDisconnectByAP/disconnect_by_ap_test.py b/autotests/testDisconnectByAP/disconnect_by_ap_test.py index 298d75c4..f003ec0c 100644 --- a/autotests/testDisconnectByAP/disconnect_by_ap_test.py +++ b/autotests/testDisconnectByAP/disconnect_by_ap_test.py @@ -10,7 +10,6 @@ from iwd import DeviceState from iwd import NetworkType from hostapd import HostapdCLI -from hostapd import hostapd_map class Test(unittest.TestCase): @@ -20,8 +19,7 @@ class Test(unittest.TestCase): devices = wd.list_devices(1) device = devices[0] - hostapd_if = list(hostapd_map.values())[0] - hostapd = HostapdCLI(hostapd_if) + hostapd = HostapdCLI(config='ssidOpen.conf') device.scan() diff --git a/autotests/testEAP-AKA/connection_test.py b/autotests/testEAP-AKA/connection_test.py index bcdb1d92..c4b7c2f9 100644 --- a/autotests/testEAP-AKA/connection_test.py +++ b/autotests/testEAP-AKA/connection_test.py @@ -10,7 +10,6 @@ from iwd import NetworkType from hlrauc import AuthCenter from hostapd import HostapdCLI -from hostapd import hostapd_map class Test(unittest.TestCase): diff --git a/autotests/testEAP-PEAPv0-CryptoBinding/ISK_test.py b/autotests/testEAP-PEAPv0-CryptoBinding/ISK_test.py index 7ba49384..a25f99ef 100644 --- a/autotests/testEAP-PEAPv0-CryptoBinding/ISK_test.py +++ b/autotests/testEAP-PEAPv0-CryptoBinding/ISK_test.py @@ -11,7 +11,6 @@ from iwd import NetworkType import testutil from hostapd import HostapdCLI -from hostapd import hostapd_map class Test(unittest.TestCase): diff --git a/autotests/testEAP-PEAPv0-CryptoBinding/NoISK_test.py b/autotests/testEAP-PEAPv0-CryptoBinding/NoISK_test.py index 0f7d432c..33ff0285 100644 --- a/autotests/testEAP-PEAPv0-CryptoBinding/NoISK_test.py +++ b/autotests/testEAP-PEAPv0-CryptoBinding/NoISK_test.py @@ -11,7 +11,6 @@ from iwd import NetworkType import testutil from hostapd import HostapdCLI -from hostapd import hostapd_map class Test(unittest.TestCase): diff --git a/autotests/testEAP-PEAPv0-CryptoBinding/main.conf b/autotests/testEAP-PEAPv0-CryptoBinding/main.conf deleted file mode 100644 index 55a5543e..00000000 --- a/autotests/testEAP-PEAPv0-CryptoBinding/main.conf +++ /dev/null @@ -1,2 +0,0 @@ -[General] -UseDefaultInterface=true diff --git a/autotests/testEAP-PWD/connection_test.py b/autotests/testEAP-PWD/connection_test.py index 0c722c44..2edc45b8 100644 --- a/autotests/testEAP-PWD/connection_test.py +++ b/autotests/testEAP-PWD/connection_test.py @@ -10,7 +10,6 @@ from iwd import PSKAgent from iwd import NetworkType from hostapd import HostapdCLI -from hostapd import hostapd_map class Test(unittest.TestCase): diff --git a/autotests/testEAP-SIM/connection_test.py b/autotests/testEAP-SIM/connection_test.py index 97956d0c..617d833b 100644 --- a/autotests/testEAP-SIM/connection_test.py +++ b/autotests/testEAP-SIM/connection_test.py @@ -10,7 +10,6 @@ from iwd import NetworkType from hlrauc import AuthCenter from hostapd import HostapdCLI -from hostapd import hostapd_map class Test(unittest.TestCase): diff --git a/autotests/testEAP-TLS-embedded-pems/connection_test.py b/autotests/testEAP-TLS-embedded-pems/connection_test.py index 1102b810..5d46868d 100644 --- a/autotests/testEAP-TLS-embedded-pems/connection_test.py +++ b/autotests/testEAP-TLS-embedded-pems/connection_test.py @@ -9,23 +9,18 @@ from iwd import IWD from iwd import PSKAgent from iwd import NetworkType import testutil -import hostapd +from hostapd import HostapdCLI class Test(unittest.TestCase): def do_test_connection_success(self, ssid, passphrase=None): + hostapd = HostapdCLI(config=ssid + '.conf') wd = IWD() if passphrase: psk_agent = PSKAgent(passphrase) wd.register_psk_agent(psk_agent) - hostapd_ifname = None - for ifname in hostapd.hostapd_map: - if ssid + '.conf' in hostapd.hostapd_map[ifname].config: - hostapd_ifname = ifname - break - devices = wd.list_devices(1) device = devices[0] @@ -52,7 +47,7 @@ class Test(unittest.TestCase): wd.wait_for_object_condition(ordered_network.network_object, condition) testutil.test_iface_operstate() - testutil.test_ifaces_connected(hostapd_ifname, device.name) + testutil.test_ifaces_connected(hostapd.ifname, device.name) device.disconnect() diff --git a/autotests/testEAP-TTLS-CHAP/connection_test.py b/autotests/testEAP-TTLS-CHAP/connection_test.py index e3719669..331e799f 100644 --- a/autotests/testEAP-TTLS-CHAP/connection_test.py +++ b/autotests/testEAP-TTLS-CHAP/connection_test.py @@ -11,7 +11,6 @@ from iwd import PSKAgent from iwd import NetworkType from hostapd import HostapdCLI -from hostapd import hostapd_map class Test(unittest.TestCase): diff --git a/autotests/testEAP-TTLS-MSCHAP/connection_test.py b/autotests/testEAP-TTLS-MSCHAP/connection_test.py index ea245a38..973370a8 100644 --- a/autotests/testEAP-TTLS-MSCHAP/connection_test.py +++ b/autotests/testEAP-TTLS-MSCHAP/connection_test.py @@ -11,7 +11,6 @@ from iwd import PSKAgent from iwd import NetworkType from hostapd import HostapdCLI -from hostapd import hostapd_map class Test(unittest.TestCase): diff --git a/autotests/testEAP-TTLS-PAP/connection_test.py b/autotests/testEAP-TTLS-PAP/connection_test.py index ce787b01..a8f6fde7 100644 --- a/autotests/testEAP-TTLS-PAP/connection_test.py +++ b/autotests/testEAP-TTLS-PAP/connection_test.py @@ -11,7 +11,6 @@ from iwd import PSKAgent from iwd import NetworkType from hostapd import HostapdCLI -from hostapd import hostapd_map class Test(unittest.TestCase): diff --git a/autotests/testEAP-WPS-Frag/wps_frag_test.py b/autotests/testEAP-WPS-Frag/wps_frag_test.py index 9d106a75..b9be0159 100644 --- a/autotests/testEAP-WPS-Frag/wps_frag_test.py +++ b/autotests/testEAP-WPS-Frag/wps_frag_test.py @@ -9,7 +9,6 @@ from iwd import IWD from iwd import DeviceState from hostapd import HostapdCLI -from hostapd import hostapd_map class Test(unittest.TestCase): @@ -32,8 +31,7 @@ class Test(unittest.TestCase): @classmethod def setUpClass(cls): - cls.hostapd_if = list(hostapd_map.values())[0] - cls.hostapd = HostapdCLI(cls.hostapd_if) + cls.hostapd = HostapdCLI(config='ssid-wps-small-mtu.conf') cls.hostapd.wps_push_button() diff --git a/autotests/testEAP-WPS/four_digit_pin_test.py b/autotests/testEAP-WPS/four_digit_pin_test.py index feb4222d..10afaa5d 100644 --- a/autotests/testEAP-WPS/four_digit_pin_test.py +++ b/autotests/testEAP-WPS/four_digit_pin_test.py @@ -9,7 +9,6 @@ from iwd import IWD from iwd import DeviceState from hostapd import HostapdCLI -from hostapd import hostapd_map class Test(unittest.TestCase): @@ -39,8 +38,7 @@ class Test(unittest.TestCase): @classmethod def setUpClass(cls): - cls.hostapd_if = list(hostapd_map.values())[0] - cls.hostapd = HostapdCLI(cls.hostapd_if) + cls.hostapd = HostapdCLI(config='ssidWPS.conf') @classmethod def tearDownClass(cls): diff --git a/autotests/testEAP-WPS/pin_test.py b/autotests/testEAP-WPS/pin_test.py index 080a91e1..706dc20b 100644 --- a/autotests/testEAP-WPS/pin_test.py +++ b/autotests/testEAP-WPS/pin_test.py @@ -9,7 +9,6 @@ from iwd import IWD from iwd import DeviceState from hostapd import HostapdCLI -from hostapd import hostapd_map class Test(unittest.TestCase): @@ -42,8 +41,7 @@ class Test(unittest.TestCase): @classmethod def setUpClass(cls): - cls.hostapd_if = list(hostapd_map.values())[0] - cls.hostapd = HostapdCLI(cls.hostapd_if) + cls.hostapd = HostapdCLI(config='ssidWPS.conf') @classmethod def tearDownClass(cls): diff --git a/autotests/testEAP-WPS/push_button_test.py b/autotests/testEAP-WPS/push_button_test.py index bbf09dcb..f82a56b5 100644 --- a/autotests/testEAP-WPS/push_button_test.py +++ b/autotests/testEAP-WPS/push_button_test.py @@ -9,8 +9,6 @@ from iwd import IWD from iwd import DeviceState from hostapd import HostapdCLI -from hostapd import hostapd_map - class Test(unittest.TestCase): def push_button_success(self, wd): @@ -38,8 +36,7 @@ class Test(unittest.TestCase): @classmethod def setUpClass(cls): - cls.hostapd_if = list(hostapd_map.values())[0] - cls.hostapd = HostapdCLI(cls.hostapd_if) + cls.hostapd = HostapdCLI(config='ssidWPS.conf') @classmethod def tearDownClass(cls): diff --git a/autotests/testFILS/fils_256_test.py b/autotests/testFILS/fils_256_test.py index aa9e441d..af033d4a 100644 --- a/autotests/testFILS/fils_256_test.py +++ b/autotests/testFILS/fils_256_test.py @@ -9,7 +9,6 @@ import iwd from iwd import IWD from iwd import PSKAgent from iwd import NetworkType -from hostapd import hostapd_map from hostapd import HostapdCLI import testutil diff --git a/autotests/testFILS/fils_384_test.py b/autotests/testFILS/fils_384_test.py index ed5cc3b0..70e3bc87 100644 --- a/autotests/testFILS/fils_384_test.py +++ b/autotests/testFILS/fils_384_test.py @@ -9,7 +9,6 @@ import iwd from iwd import IWD from iwd import PSKAgent from iwd import NetworkType -from hostapd import hostapd_map from hostapd import HostapdCLI import testutil diff --git a/autotests/testFT-8021x-roam/test.py b/autotests/testFT-8021x-roam/connection_test.py similarity index 99% rename from autotests/testFT-8021x-roam/test.py rename to autotests/testFT-8021x-roam/connection_test.py index 0e6f733e..65c73492 100644 --- a/autotests/testFT-8021x-roam/test.py +++ b/autotests/testFT-8021x-roam/connection_test.py @@ -8,7 +8,7 @@ import iwd from iwd import IWD from iwd import NetworkType from hwsim import Hwsim -from hostapd import HostapdCLI, hostapd_map +from hostapd import HostapdCLI import testutil class Test(unittest.TestCase): diff --git a/autotests/testFT-FILS-SHA384/test.py b/autotests/testFT-FILS-SHA256/connection_test.py similarity index 99% rename from autotests/testFT-FILS-SHA384/test.py rename to autotests/testFT-FILS-SHA256/connection_test.py index 7b800f1c..16f46210 100644 --- a/autotests/testFT-FILS-SHA384/test.py +++ b/autotests/testFT-FILS-SHA256/connection_test.py @@ -9,7 +9,7 @@ from iwd import IWD from iwd import PSKAgent from iwd import NetworkType from hwsim import Hwsim -from hostapd import HostapdCLI, hostapd_map +from hostapd import HostapdCLI import testutil class Test(unittest.TestCase): diff --git a/autotests/testFT-FILS-SHA256/test.py b/autotests/testFT-FILS-SHA384/connection_test.py similarity index 99% rename from autotests/testFT-FILS-SHA256/test.py rename to autotests/testFT-FILS-SHA384/connection_test.py index 7b800f1c..16f46210 100644 --- a/autotests/testFT-FILS-SHA256/test.py +++ b/autotests/testFT-FILS-SHA384/connection_test.py @@ -9,7 +9,7 @@ from iwd import IWD from iwd import PSKAgent from iwd import NetworkType from hwsim import Hwsim -from hostapd import HostapdCLI, hostapd_map +from hostapd import HostapdCLI import testutil class Test(unittest.TestCase): diff --git a/autotests/testFT-PSK-over-DS/test.py b/autotests/testFT-PSK-over-DS/connection_test.py similarity index 99% rename from autotests/testFT-PSK-over-DS/test.py rename to autotests/testFT-PSK-over-DS/connection_test.py index f3dd088c..2cfdf245 100644 --- a/autotests/testFT-PSK-over-DS/test.py +++ b/autotests/testFT-PSK-over-DS/connection_test.py @@ -9,7 +9,7 @@ from iwd import IWD from iwd import PSKAgent from iwd import NetworkType from hwsim import Hwsim -from hostapd import HostapdCLI, hostapd_map +from hostapd import HostapdCLI import testutil class Test(unittest.TestCase): diff --git a/autotests/testFT-PSK-roam/test.py b/autotests/testFT-PSK-roam/connection_test.py similarity index 96% rename from autotests/testFT-PSK-roam/test.py rename to autotests/testFT-PSK-roam/connection_test.py index 2443593d..f40fdf58 100644 --- a/autotests/testFT-PSK-roam/test.py +++ b/autotests/testFT-PSK-roam/connection_test.py @@ -9,7 +9,7 @@ from iwd import IWD from iwd import PSKAgent from iwd import NetworkType from hwsim import Hwsim -from hostapd import HostapdCLI, hostapd_map +from hostapd import HostapdCLI import testutil class Test(unittest.TestCase): @@ -24,12 +24,14 @@ class Test(unittest.TestCase): rule1.source = self.bss_radio[1].addresses[0] rule1.bidirectional = True - wd = IWD() + wd = self.wd psk_agent = PSKAgent("EasilyGuessedPassword") wd.register_psk_agent(psk_agent) device = wd.list_devices(1)[0] + # prevent autoconnect + device.disconnect() # Check that iwd selects BSS 0 first rule0.signal = -2000 @@ -107,12 +109,14 @@ class Test(unittest.TestCase): rule1.source = self.bss_radio[1].addresses[0] rule1.bidirectional = True - wd = IWD() + wd = self.wd psk_agent = PSKAgent("EasilyGuessedPassword") wd.register_psk_agent(psk_agent) device = wd.list_devices(1)[0] + # prevent autoconnect + device.disconnect() # Check that iwd selects BSS 0 first rule0.signal = -2000 @@ -176,6 +180,8 @@ class Test(unittest.TestCase): testutil.test_ifaces_connected(self.bss_hostapd[1].ifname, device.name) self.assertRaises(Exception, testutil.test_ifaces_connected, (self.bss_hostapd[0].ifname, device.name)) + def setUp(self): + self.wd = IWD() def tearDown(self): os.system('ifconfig "' + self.bss_hostapd[0].ifname + '" down') @@ -184,15 +190,14 @@ class Test(unittest.TestCase): os.system('ifconfig "' + self.bss_hostapd[1].ifname + '" up') hwsim = Hwsim() - wd = IWD() - device = wd.list_devices(1)[0] + device = self.wd.list_devices(1)[0] try: device.disconnect() except: pass condition = 'obj.state == DeviceState.disconnected' - wd.wait_for_object_condition(device, condition) + self.wd.wait_for_object_condition(device, condition) for rule in list(hwsim.rules.keys()): del hwsim.rules[rule] diff --git a/autotests/testFT-SAE-roam/test.py b/autotests/testFT-SAE-roam/connection_test.py similarity index 99% rename from autotests/testFT-SAE-roam/test.py rename to autotests/testFT-SAE-roam/connection_test.py index 9c2b3ee1..3e209560 100644 --- a/autotests/testFT-SAE-roam/test.py +++ b/autotests/testFT-SAE-roam/connection_test.py @@ -9,7 +9,7 @@ from iwd import IWD from iwd import PSKAgent from iwd import NetworkType from hwsim import Hwsim -from hostapd import HostapdCLI, hostapd_map +from hostapd import HostapdCLI import testutil class Test(unittest.TestCase): diff --git a/autotests/testHT-VHT/test.py b/autotests/testHT-VHT/connection_test.py similarity index 98% rename from autotests/testHT-VHT/test.py rename to autotests/testHT-VHT/connection_test.py index 0129d8a0..e4781ea0 100644 --- a/autotests/testHT-VHT/test.py +++ b/autotests/testHT-VHT/connection_test.py @@ -9,9 +9,9 @@ from iwd import IWD from iwd import PSKAgent from iwd import NetworkType from hwsim import Hwsim -from hostapd import HostapdCLI, hostapd_map import testutil from time import sleep +from hostapd import HostapdCLI class Test(unittest.TestCase): def do_connect(self, wd, device, hostapd): diff --git a/autotests/testOWE/connection_test.py b/autotests/testOWE/connection_test.py index e4482bc0..539b06d0 100644 --- a/autotests/testOWE/connection_test.py +++ b/autotests/testOWE/connection_test.py @@ -7,7 +7,6 @@ sys.path.append('../util') import iwd from iwd import IWD from iwd import NetworkType -from hostapd import hostapd_map from hostapd import HostapdCLI import testutil diff --git a/autotests/testOWE/renegotiate_test.py b/autotests/testOWE/renegotiate_test.py index 57705a59..7c736acd 100644 --- a/autotests/testOWE/renegotiate_test.py +++ b/autotests/testOWE/renegotiate_test.py @@ -7,7 +7,6 @@ sys.path.append('../util') import iwd from iwd import IWD from iwd import NetworkType -from hostapd import hostapd_map from hostapd import HostapdCLI import testutil diff --git a/autotests/testPreauth-roam/test.py b/autotests/testPreauth-roam/connection_test.py similarity index 98% rename from autotests/testPreauth-roam/test.py rename to autotests/testPreauth-roam/connection_test.py index 06babcea..ed043c3f 100644 --- a/autotests/testPreauth-roam/test.py +++ b/autotests/testPreauth-roam/connection_test.py @@ -9,7 +9,7 @@ from iwd import IWD from iwd import PSKAgent from iwd import NetworkType from hwsim import Hwsim -from hostapd import HostapdCLI, hostapd_map +from hostapd import HostapdCLI import testutil class Test(unittest.TestCase): diff --git a/autotests/testRSSIAgent/test.py b/autotests/testRSSIAgent/connection_test.py similarity index 100% rename from autotests/testRSSIAgent/test.py rename to autotests/testRSSIAgent/connection_test.py diff --git a/autotests/testSAE/connection_test.py b/autotests/testSAE/connection_test.py index 874eb833..56bb1f6d 100644 --- a/autotests/testSAE/connection_test.py +++ b/autotests/testSAE/connection_test.py @@ -8,17 +8,13 @@ import iwd from iwd import IWD from iwd import PSKAgent from iwd import NetworkType -from hostapd import hostapd_map +from hostapd import HostapdCLI import testutil class Test(unittest.TestCase): def validate_connection(self, wd): - hostapd_if = None - - for hostapd in hostapd_map.values(): - if hostapd.config == 'ssidSAE.conf': - hostapd_if = hostapd.name + hostapd = HostapdCLI(config='ssidSAE.conf') psk_agent = PSKAgent("secret123") wd.register_psk_agent(psk_agent) @@ -56,7 +52,7 @@ class Test(unittest.TestCase): wd.wait(2) testutil.test_iface_operstate(intf=device.name) - testutil.test_ifaces_connected(if0=device.name, if1=hostapd_if) + testutil.test_ifaces_connected(if0=device.name, if1=hostapd.ifname) device.disconnect() diff --git a/autotests/testSAE/group_20_connection_test.py b/autotests/testSAE/group_20_connection_test.py index 033c8850..5631878a 100644 --- a/autotests/testSAE/group_20_connection_test.py +++ b/autotests/testSAE/group_20_connection_test.py @@ -8,17 +8,13 @@ import iwd from iwd import IWD from iwd import PSKAgent from iwd import NetworkType -from hostapd import hostapd_map +from hostapd import HostapdCLI import testutil class Test(unittest.TestCase): def validate_connection(self, wd): - hostapd_if = None - - for hostapd in hostapd_map.values(): - if hostapd.config == 'ssidSAE-20.conf': - hostapd_if = hostapd.name + hostapd = HostapdCLI(config='ssidSAE-20.conf') psk_agent = PSKAgent("secret123") wd.register_psk_agent(psk_agent) @@ -56,7 +52,7 @@ class Test(unittest.TestCase): wd.wait(2) testutil.test_iface_operstate(intf=device.name) - testutil.test_ifaces_connected(if0=device.name, if1=hostapd_if) + testutil.test_ifaces_connected(if0=device.name, if1=hostapd.ifname) device.disconnect() diff --git a/autotests/testSAQuery-spoofing/connection_test.py b/autotests/testSAQuery-spoofing/connection_test.py index e9d31c15..4887b172 100644 --- a/autotests/testSAQuery-spoofing/connection_test.py +++ b/autotests/testSAQuery-spoofing/connection_test.py @@ -9,7 +9,7 @@ from iwd import IWD from iwd import PSKAgent from iwd import NetworkType from hwsim import Hwsim -from hostapd import HostapdCLI, hostapd_map +from hostapd import HostapdCLI from time import sleep diff --git a/autotests/testSAQuery/connection_test.py b/autotests/testSAQuery/connection_test.py index de0fe2cd..9ea95e2b 100644 --- a/autotests/testSAQuery/connection_test.py +++ b/autotests/testSAQuery/connection_test.py @@ -8,7 +8,7 @@ import iwd from iwd import IWD from iwd import PSKAgent from iwd import NetworkType -from hostapd import HostapdCLI, hostapd_map +from hostapd import HostapdCLI class Test(unittest.TestCase):