[PATCH v2 5/5] auto-t: fix several DPP tests after station state changes

James Prestwood
2024-07-22T18:29:40Z

After the station state changes in DPP setting autoconnect=True was
causing DPP to stop prior to being able to scan for the network.
Instead we can start autoconnect earlier so we aren't toggling the
property while DPP is running.
---
autotests/testDPP/connection_test.py | 6 ++----
autotests/testDPP/pkex_test.py | 15 ++++++---------
2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/autotests/testDPP/connection_test.py b/autotests/testDPP/connection_test.py
index f72a412d..e4f07af7 100644
--- a/autotests/testDPP/connection_test.py
+++ b/autotests/testDPP/connection_test.py
@@ -38,20 +38,18 @@ class Test(unittest.TestCase):

def test_iwd_as_enrollee_scan_after(self):
self.wpas.disconnect()
+ self.device.autoconnect = True
uri = self.device.dpp_start_enrollee()

self.wpas.dpp_configurator_create(uri)
self.wpas.dpp_configurator_start('ssidCCMP', 'secret123')

- self.hapd.reload()
-
with self.assertRaises(Exception):
self.device.get_ordered_network('ssidCCMP', scan_if_needed=False)

+ self.hapd.reload()
self.hapd.wait_for_event('AP-ENABLED')

- self.device.autoconnect = True
-
condition = 'obj.state == DeviceState.connected'
self.wd.wait_for_object_condition(self.device, condition)

diff --git a/autotests/testDPP/pkex_test.py b/autotests/testDPP/pkex_test.py
index 3d3ea6d1..a651c6f6 100644
--- a/autotests/testDPP/pkex_test.py
+++ b/autotests/testDPP/pkex_test.py
@@ -160,10 +160,8 @@ class Test(unittest.TestCase):

def test_pkex_iwd_to_iwd(self):
self.start_iwd_pkex_configurator(self.device[0])
-
- self.device[1].dpp_pkex_enroll('secret123', identifier="test")
-
self.device[1].autoconnect = True
+ self.device[1].dpp_pkex_enroll('secret123', identifier="test")

condition = 'obj.state == DeviceState.connected'
self.wd.wait_for_object_condition(self.device[1], condition)
@@ -176,10 +174,8 @@ class Test(unittest.TestCase):

def test_pkex_configurator_with_agent(self):
self.start_iwd_pkex_configurator(self.device[0], agent=True)
-
- self.device[1].dpp_pkex_enroll('secret123', identifier="test")
-
self.device[1].autoconnect = True
+ self.device[1].dpp_pkex_enroll('secret123', identifier="test")

condition = 'obj.state == DeviceState.connected'
self.wd.wait_for_object_condition(self.device[1], condition)
@@ -198,8 +194,8 @@ class Test(unittest.TestCase):

self.start_iwd_pkex_configurator(self.device[0])

- self.device[1].dpp_pkex_enroll('secret123', identifier="test")
self.device[1].autoconnect = False
+ self.device[1].dpp_pkex_enroll('secret123', identifier="test")

condition = 'obj.state == DeviceState.connected'
self.wd.wait_for_object_condition(self.device[1], condition)
@@ -240,8 +236,9 @@ class Test(unittest.TestCase):

self.start_iwd_pkex_configurator(self.device[0], profile='ssidHidden.psk')

- self.device[1].dpp_pkex_enroll('secret123', identifier="test")
self.device[1].autoconnect = False
+ self.device[1].dpp_pkex_enroll('secret123', identifier="test")
+

condition = 'obj.state == DeviceState.connected'
self.wd.wait_for_object_condition(self.device[1], condition)
@@ -257,8 +254,8 @@ class Test(unittest.TestCase):
self.hapd_hidden.wait_for_event('AP-ENABLED')
self.start_iwd_pkex_configurator(self.device[0], profile='ssidHidden.psk')

- self.device[1].dpp_pkex_enroll('secret123', identifier="test")
self.device[1].autoconnect = False
+ self.device[1].dpp_pkex_enroll('secret123', identifier="test")

condition = 'obj.state == DeviceState.connected'
self.wd.wait_for_object_condition(self.device[1], condition)
--
2.34.1