From eeca2b3f38158dc5307cc1467b8ed2f9dc18772a Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Mon, 14 Sep 2020 14:04:06 -0700 Subject: [PATCH] auto-t: update AdHoc tests to use AdHocDevice --- autotests/testAdHoc/adhoc_test.py | 18 ++++++++++++++---- autotests/testAdHoc/open_test.py | 19 ++++++++++++++----- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/autotests/testAdHoc/adhoc_test.py b/autotests/testAdHoc/adhoc_test.py index 119c6c7e..13c0c016 100644 --- a/autotests/testAdHoc/adhoc_test.py +++ b/autotests/testAdHoc/adhoc_test.py @@ -17,11 +17,21 @@ class Test(unittest.TestCase): self.assertIsNotNone(dev1) self.assertIsNotNone(dev2) - dev1.start_adhoc("AdHocNetwork", "secret123") - dev2.start_adhoc("AdHocNetwork", "secret123") + adhoc1 = dev1.start_adhoc("AdHocNetwork", "secret123") - dev1.adhoc_wait_for_connected(dev2.address) - dev2.adhoc_wait_for_connected(dev1.address) + condition = 'obj.started == True' + wd.wait_for_object_condition(adhoc1, condition) + + adhoc2 = dev2.start_adhoc("AdHocNetwork", "secret123") + + condition = 'obj.started == True' + wd.wait_for_object_condition(adhoc1, condition) + + condition = '"%s" in obj.connected_peers' % dev2.address + wd.wait_for_object_condition(adhoc1, condition) + + condition = '"%s" in obj.connected_peers' % dev1.address + wd.wait_for_object_condition(adhoc2, condition) testutil.test_iface_operstate(dev1.name) testutil.test_iface_operstate(dev2.name) diff --git a/autotests/testAdHoc/open_test.py b/autotests/testAdHoc/open_test.py index a3882a50..4e0ae27f 100644 --- a/autotests/testAdHoc/open_test.py +++ b/autotests/testAdHoc/open_test.py @@ -18,12 +18,21 @@ class Test(unittest.TestCase): self.assertIsNotNone(dev1) self.assertIsNotNone(dev2) - dev1.start_adhoc("AdHocNetwork") - sleep(1) - dev2.start_adhoc("AdHocNetwork") + adhoc1 = dev1.start_adhoc("AdHocNetwork") - dev1.adhoc_wait_for_connected(dev2.address) - dev2.adhoc_wait_for_connected(dev1.address) + condition = 'obj.started == True' + wd.wait_for_object_condition(adhoc1, condition) + + adhoc2 = dev2.start_adhoc("AdHocNetwork") + + condition = 'obj.started == True' + wd.wait_for_object_condition(adhoc1, condition) + + condition = '"%s" in obj.connected_peers' % dev2.address + wd.wait_for_object_condition(adhoc1, condition) + + condition = '"%s" in obj.connected_peers' % dev1.address + wd.wait_for_object_condition(adhoc2, condition) testutil.test_iface_operstate(dev1.name) testutil.test_iface_operstate(dev2.name)