3
0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00

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.
This commit is contained in:
James Prestwood 2020-05-06 14:32:15 -07:00 committed by Denis Kenzior
parent da3f66ea68
commit b600440ea2

View File

@ -12,7 +12,7 @@ from iwd import NetworkType
class TestConnectAutoConnect(unittest.TestCase): class TestConnectAutoConnect(unittest.TestCase):
def check_connect(self, wd, device, ssid, throws): 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' condition = 'not obj.connected'
wd.wait_for_object_condition(ordered_network.network_object, condition) wd.wait_for_object_condition(ordered_network.network_object, condition)
@ -54,12 +54,6 @@ class TestConnectAutoConnect(unittest.TestCase):
self.assertIsNotNone(devices) self.assertIsNotNone(devices)
device = devices[0] 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: if autoconnect:
self.check_autoconnect(wd, device, ssid, throws) self.check_autoconnect(wd, device, ssid, throws)
else: else: