I had added this without realizing wait_for_object_condition can do this already using the device object. --- autotests/testSAE/clogging_test.py | 3 ++- autotests/util/iwd.py | 25 ------------------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/autotests/testSAE/clogging_test.py b/autotests/testSAE/clogging_test.py index e94e2ad6..c46c5821 100644 --- a/autotests/testSAE/clogging_test.py +++ b/autotests/testSAE/clogging_test.py @@ -48,7 +48,8 @@ class Test(unittest.TestCase): wd.wait_for_object_condition(n.network_object, condition) for d in devices: - d.wait_for_connected() + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(d, condition) for d in devices: d.disconnect() diff --git a/autotests/util/iwd.py b/autotests/util/iwd.py index 2041e2d6..ec5e662f 100755 --- a/autotests/util/iwd.py +++ b/autotests/util/iwd.py @@ -564,31 +564,6 @@ class Device(IWDDBusAbstract): if self._adhoc_timed_out: raise TimeoutError("Timed out waiting for peer %s" % addr) - def wait_for_connected(self): - if str(self.state) == "connected": - return - - self._connected_success = False - self._connected_timed_out = False - - def wait_timeout_cb(): - self._connected_timed_out = True - return False - - def connected_prop_changed(iface, changed, invalid): - if changed.get('State', None): - if changed['State'] == 'connected': - self._connected_success = True - - self._prop_proxy.connect_to_signal('PropertiesChanged', - connected_prop_changed) - GLib.timeout_add(int(15 * 1000), wait_timeout_cb) - context = mainloop.get_context() - while not self._connected_success: - context.iteration(may_block=True) - if self._connected_timed_out: - raise TimeoutError("Timed out waiting for connected") - def __str__(self, prefix = ''): return prefix + 'Device: ' + self.device_path + '\n'\ + prefix + '\tName:\t\t' + self.name + '\n'\ -- 2.26.2