From b600440ea2245e2545d24ef50fec4291fb9f6988 Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Wed, 6 May 2020 14:32:15 -0700 Subject: [PATCH] auto-t: use scan_if_needed for testConnectAutoconnect In certain cases the autoconnect portion of each subtest was connecting to the network so fast that the check for obj.scanning was never successful since IWD was already connected (and in turn not scanning). Since the autoconnect path will wait for the device to be connected there really isn't a reason to wait for any scanning conditions. The normal connect path does need to wait for scanning though, and for this we can now use the new scan_if_needed parameter to get_ordered_networks. --- autotests/testConnectAutoconnect/validation.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/autotests/testConnectAutoconnect/validation.py b/autotests/testConnectAutoconnect/validation.py index 43cbaf02..6db479a9 100644 --- a/autotests/testConnectAutoconnect/validation.py +++ b/autotests/testConnectAutoconnect/validation.py @@ -12,7 +12,7 @@ from iwd import NetworkType class TestConnectAutoConnect(unittest.TestCase): def check_connect(self, wd, device, ssid, throws): - ordered_network = device.get_ordered_network(ssid) + ordered_network = device.get_ordered_network(ssid, scan_if_needed=True) condition = 'not obj.connected' wd.wait_for_object_condition(ordered_network.network_object, condition) @@ -54,12 +54,6 @@ class TestConnectAutoConnect(unittest.TestCase): self.assertIsNotNone(devices) device = devices[0] - condition = 'obj.scanning' - wd.wait_for_object_condition(device, condition) - - condition = 'not obj.scanning' - wd.wait_for_object_condition(device, condition) - if autoconnect: self.check_autoconnect(wd, device, ssid, throws) else: