From 7cbbca23cefed799be73edd75b6b63c87308d56a Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Thu, 2 May 2019 11:27:13 -0700 Subject: [PATCH] auto-t: fix OWE tests, use explicit ifnames --- autotests/testOWE/connection_test.py | 9 ++++++++- autotests/testOWE/renegotiate_test.py | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/autotests/testOWE/connection_test.py b/autotests/testOWE/connection_test.py index 4820eaee..1ff433c7 100644 --- a/autotests/testOWE/connection_test.py +++ b/autotests/testOWE/connection_test.py @@ -7,11 +7,18 @@ 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 class Test(unittest.TestCase): def test_connection_success(self): + for intf in hostapd_map.values(): + if intf.config == 'ssidOWE.conf': + hapd = HostapdCLI(intf) + break + wd = IWD() devices = wd.list_devices(1) @@ -38,7 +45,7 @@ class Test(unittest.TestCase): wd.wait_for_object_condition(ordered_network.network_object, condition) testutil.test_iface_operstate() - testutil.test_ifaces_connected() + testutil.test_ifaces_connected(device.name, hapd.ifname) device.disconnect() diff --git a/autotests/testOWE/renegotiate_test.py b/autotests/testOWE/renegotiate_test.py index 39bac881..007538f7 100644 --- a/autotests/testOWE/renegotiate_test.py +++ b/autotests/testOWE/renegotiate_test.py @@ -7,11 +7,18 @@ 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 class Test(unittest.TestCase): def test_connection_success(self): + for intf in hostapd_map.values(): + if intf.config == 'ssidGroup20.conf': + hapd = HostapdCLI(intf) + break + wd = IWD() devices = wd.list_devices(1) @@ -38,7 +45,7 @@ class Test(unittest.TestCase): wd.wait_for_object_condition(ordered_network.network_object, condition) testutil.test_iface_operstate() - testutil.test_ifaces_connected() + testutil.test_ifaces_connected(device.name, hapd.ifname) device.disconnect()