Since IWD tries group 20 first all other OWE tests are actually triggering group negotiation where this test is not. Since this code is exercised this test can be removed completely, as well as the additional radio/network. --- autotests/testOWE/hw.conf | 3 +- autotests/testOWE/renegotiate_test.py | 60 --------------------------- autotests/testOWE/ssidGroup20.conf | 8 ---- 3 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 autotests/testOWE/renegotiate_test.py delete mode 100644 autotests/testOWE/ssidGroup20.conf diff --git a/autotests/testOWE/hw.conf b/autotests/testOWE/hw.conf index 1421b69c..dc2aaaf9 100644 --- a/autotests/testOWE/hw.conf +++ b/autotests/testOWE/hw.conf @@ -1,8 +1,7 @@ [SETUP] -num_radios=4 +num_radios=3 hwsim_medium=yes [HOSTAPD] rad0=ssidOWE-1.conf rad1=ssidOWE-2.conf -rad2=ssidGroup20.conf diff --git a/autotests/testOWE/renegotiate_test.py b/autotests/testOWE/renegotiate_test.py deleted file mode 100644 index e3fd911b..00000000 --- a/autotests/testOWE/renegotiate_test.py +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/python3 - -import unittest -import sys - -sys.path.append('../util') -import iwd -from iwd import IWD -from iwd import NetworkType -from hostapd import HostapdCLI -import testutil - -class Test(unittest.TestCase): - - def test_connection_success(self): - hapd = HostapdCLI(config='ssidGroup20.conf') - - wd = IWD() - - devices = wd.list_devices(1) - device = devices[0] - - condition = 'not obj.scanning' - wd.wait_for_object_condition(device, condition) - - device.scan() - - condition = 'not obj.scanning' - wd.wait_for_object_condition(device, condition) - - ordered_network = device.get_ordered_network('ssidGroup20') - - self.assertEqual(ordered_network.type, NetworkType.open) - - condition = 'not obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) - - ordered_network.network_object.connect() - - condition = 'obj.state == DeviceState.connected' - wd.wait_for_object_condition(device, condition) - - testutil.test_iface_operstate() - testutil.test_ifaces_connected(device.name, hapd.ifname) - - device.disconnect() - - condition = 'not obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) - - @classmethod - def setUpClass(cls): - pass - - @classmethod - def tearDownClass(cls): - IWD.clear_storage() - -if __name__ == '__main__': - unittest.main(exit=True) diff --git a/autotests/testOWE/ssidGroup20.conf b/autotests/testOWE/ssidGroup20.conf deleted file mode 100644 index afd5c0a4..00000000 --- a/autotests/testOWE/ssidGroup20.conf +++ /dev/null @@ -1,8 +0,0 @@ -ctrl_interface=/var/run/hostapd -hw_mode=g -channel=1 -ssid=ssidGroup20 -wpa=2 -wpa_key_mgmt=OWE -rsn_pairwise=CCMP -owe_groups=20 -- 2.31.1