From 72dbab789d8d391fc65c3db3edcd9086630ef39d Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Tue, 2 Nov 2021 12:57:51 -0700 Subject: [PATCH] auto-t: allow testAP to benefit from re-scanning If a beacon is lost testAP will fail since it did not utilize any rescanning logic. Now it can use this feature by passing full_scan. This is required since IWD APs are not known to test-runner like hostapd APs are. --- autotests/testAP/connection_test.py | 5 +++-- autotests/testAP/dhcp_config_test.py | 4 ++-- autotests/testAP/dhcp_test.py | 4 ++-- autotests/testAP/failure_test.py | 6 ++++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/autotests/testAP/connection_test.py b/autotests/testAP/connection_test.py index 1bba5f35..4c784014 100644 --- a/autotests/testAP/connection_test.py +++ b/autotests/testAP/connection_test.py @@ -55,9 +55,10 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(dev2, condition) - ordered_networks = dev2.get_ordered_networks() + networks = {} + networks['TestAP1'] = dev2.get_ordered_network('TestAP1') + networks['TestAP2'] = dev2.get_ordered_network('TestAP2', full_scan=True) - 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/dhcp_config_test.py b/autotests/testAP/dhcp_config_test.py index 975cab4d..afea5415 100644 --- a/autotests/testAP/dhcp_config_test.py +++ b/autotests/testAP/dhcp_config_test.py @@ -37,9 +37,9 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(dev2, condition) - ordered_networks = dev2.get_ordered_networks() + networks = {} + networks['APConfig'] = dev2.get_ordered_network('APConfig', full_scan=True) - networks = { n.name: n for n in ordered_networks } self.assertEqual(networks['APConfig'].type, NetworkType.psk) psk_agent = PSKAgent('password123') diff --git a/autotests/testAP/dhcp_test.py b/autotests/testAP/dhcp_test.py index e69c4465..0118b17d 100644 --- a/autotests/testAP/dhcp_test.py +++ b/autotests/testAP/dhcp_test.py @@ -34,9 +34,9 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(dev2, condition) - ordered_networks = dev2.get_ordered_networks() + networks = {} + networks['TestAP2'] = dev2.get_ordered_network('TestAP2', full_scan=True) - networks = { n.name: n for n in ordered_networks } self.assertEqual(networks['TestAP2'].type, NetworkType.psk) psk_agent = PSKAgent('Password2') diff --git a/autotests/testAP/failure_test.py b/autotests/testAP/failure_test.py index fc5cb6a7..05b5a7fb 100644 --- a/autotests/testAP/failure_test.py +++ b/autotests/testAP/failure_test.py @@ -56,8 +56,10 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(dev2, condition) - ordered_networks = dev2.get_ordered_networks() - networks = { n.name: n for n in ordered_networks } + networks = {} + networks['TestAP1'] = dev2.get_ordered_network('TestAP1') + networks['TestAP2'] = dev2.get_ordered_network('TestAP2', full_scan=True) + self.assertEqual(networks['TestAP1'].type, NetworkType.psk) self.assertEqual(networks['TestAP2'].type, NetworkType.psk)