From 63232dd7fee269ca4e693ef852517dffbc0072b6 Mon Sep 17 00:00:00 2001 From: Tim Kourt Date: Mon, 2 Jul 2018 16:17:36 -0700 Subject: [PATCH] auto-t: known networks 1) wait for a device to become available 2) add try, except block for the clean termination of iwd in the case of a failure 3) increase the max execution time to help with valgrind --- .../testKnownNetworks/known_network_test.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/autotests/testKnownNetworks/known_network_test.py b/autotests/testKnownNetworks/known_network_test.py index 87d9f3e6..5aa45098 100644 --- a/autotests/testKnownNetworks/known_network_test.py +++ b/autotests/testKnownNetworks/known_network_test.py @@ -10,7 +10,7 @@ from iwd import IWD class Test(unittest.TestCase): def connect_to_new_network(self, wd): - devices = wd.list_devices(); + devices = wd.list_devices(1); self.assertIsNotNone(devices) device = devices[0] @@ -35,8 +35,7 @@ class Test(unittest.TestCase): condition = 'not obj.connected' wd.wait_for_object_condition(ordered_network.network_object, condition) - def test_list_removal_and_addition(self): - wd = IWD(start_iwd_daemon = True) + def list_removal_and_addition(self, wd): known_networks = wd.list_known_networks() self.assertEqual(len(known_networks), 3) @@ -57,6 +56,17 @@ class Test(unittest.TestCase): known_networks = wd.list_known_networks() self.assertEqual(len(known_networks), 0) + def test_known_networks(self): + wd = IWD(True) + + try: + self.list_removal_and_addition(wd) + except: + del wd + raise + + del wd + @classmethod def setUpClass(cls): IWD.copy_to_storage('known_networks/ssidOpen.open')