From ae47d12520050d436c6e0be38aa0234920156b74 Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Tue, 8 Jan 2019 14:43:57 -0800 Subject: [PATCH] auto-t: use get_ordered_network call in remaining tests This hopefully wraps up the API migration to get_ordered_network rather than the plural (get_ordered_networks) version. --- autotests/testAP/failure_test.py | 1 - autotests/testAP/test.py | 1 - autotests/testConnectAutoconnect/validation.py | 14 ++------------ autotests/testFT-8021x-roam/test.py | 6 +----- autotests/testFT-PSK-roam/test.py | 6 +----- 5 files changed, 4 insertions(+), 24 deletions(-) diff --git a/autotests/testAP/failure_test.py b/autotests/testAP/failure_test.py index 8c7a9568..cad7bf6e 100644 --- a/autotests/testAP/failure_test.py +++ b/autotests/testAP/failure_test.py @@ -75,7 +75,6 @@ class Test(unittest.TestCase): wd.wait_for_object_condition(dev2, condition) ordered_networks = dev2.get_ordered_networks() - self.assertEqual(len(ordered_networks), 2) networks = { n.name: n for n in ordered_networks } self.assertEqual(networks['TestAP1'].type, NetworkType.psk) self.assertEqual(networks['TestAP2'].type, NetworkType.psk) diff --git a/autotests/testAP/test.py b/autotests/testAP/test.py index a1b62a5a..39161981 100644 --- a/autotests/testAP/test.py +++ b/autotests/testAP/test.py @@ -68,7 +68,6 @@ class Test(unittest.TestCase): wd.wait_for_object_condition(dev2, condition) ordered_networks = dev2.get_ordered_networks() - self.assertEqual(len(ordered_networks), 2) networks = { n.name: n for n in ordered_networks } self.assertEqual(networks['TestAP1'].type, NetworkType.psk) self.assertEqual(networks['TestAP2'].type, NetworkType.psk) diff --git a/autotests/testConnectAutoconnect/validation.py b/autotests/testConnectAutoconnect/validation.py index 7884d255..2118f55b 100644 --- a/autotests/testConnectAutoconnect/validation.py +++ b/autotests/testConnectAutoconnect/validation.py @@ -12,15 +12,7 @@ from iwd import NetworkType class TestConnectAutoconnect(unittest.TestCase): def check_connect(self, wd, device, ssid, throws): - ordered_networks = device.get_ordered_networks() - ordered_network = None - - for o_n in ordered_networks: - if o_n.name == ssid: - ordered_network = o_n - break - - self.assertEqual(ordered_network.name, ssid) + ordered_network = device.get_ordered_network(ssid) condition = 'not obj.connected' wd.wait_for_object_condition(ordered_network.network_object, condition) @@ -43,10 +35,8 @@ class TestConnectAutoconnect(unittest.TestCase): condition = 'obj.connected_network is not None' wd.wait_for_object_condition(device, condition) - ordered_network = device.get_ordered_networks()[0] + ordered_network = device.get_ordered_network(ssid) - self.assertIsNotNone(ordered_network) - self.assertEqual(ordered_network.name, ssid) self.assertTrue(ordered_network.network_object.connected) device.disconnect() diff --git a/autotests/testFT-8021x-roam/test.py b/autotests/testFT-8021x-roam/test.py index f2480f41..20d88bc6 100644 --- a/autotests/testFT-8021x-roam/test.py +++ b/autotests/testFT-8021x-roam/test.py @@ -121,11 +121,7 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - - self.assertEqual(len(ordered_networks), 1) - ordered_network = ordered_networks[0] - self.assertEqual(ordered_network.name, "TestFT") + ordered_network = device.get_ordered_network("TestFT") self.assertEqual(ordered_network.type, NetworkType.eap) self.assertEqual(ordered_network.signal_strength, -2000) diff --git a/autotests/testFT-PSK-roam/test.py b/autotests/testFT-PSK-roam/test.py index d079e20d..5224a042 100644 --- a/autotests/testFT-PSK-roam/test.py +++ b/autotests/testFT-PSK-roam/test.py @@ -130,11 +130,7 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - - self.assertEqual(len(ordered_networks), 1) - ordered_network = ordered_networks[0] - self.assertEqual(ordered_network.name, "TestFT") + ordered_network = device.get_ordered_network("TestFT") self.assertEqual(ordered_network.type, NetworkType.psk) self.assertEqual(ordered_network.signal_strength, -2000)