From 2a2e4a58ad6edd6b3a8c84b99274d7f90a8a2cd8 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 23 Feb 2022 15:31:21 +0100 Subject: tests: Wait for condition in test_connected_input_devices() Rather than wait for mainloop. --- tests/integration-test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/integration-test.py b/tests/integration-test.py index 7b0d233e..4ec7f82f 100755 --- a/tests/integration-test.py +++ b/tests/integration-test.py @@ -396,33 +396,33 @@ class OopTests(dbusmock.DBusTestCase): dev2.UpdateProperties('org.bluez.Device1', {'UUIDs': dbus.Array(['00001124-0000-1000-8000-00805f9b34fb'], variant_level=1)}) - self.wait_for_mainloop() list_store = self.client.get_devices() + self.wait_for_condition(lambda: list_store.get_n_items() == 2) self.assertEqual(list_store.get_n_items(), 2) self.assertEqual(self.client.has_connected_input_devices(), False) dev1.UpdateProperties('org.bluez.Device1', {'Connected': dbus.Boolean(True, variant_level=1)}) - self.wait_for_mainloop() + self.wait_for_condition(lambda: self.client.has_connected_input_devices() == True) self.assertEqual(self.client.has_connected_input_devices(), True) dev1.UpdateProperties('org.bluez.Device1', {'Connected': dbus.Boolean(False, variant_level=1)}) - self.wait_for_mainloop() + self.wait_for_condition(lambda: self.client.has_connected_input_devices() == False) self.assertEqual(self.client.has_connected_input_devices(), False) dev2.UpdateProperties('org.bluez.Device1', {'Connected': dbus.Boolean(True, variant_level=1)}) - self.wait_for_mainloop() + self.wait_for_condition(lambda: self.client.has_connected_input_devices() == True) self.assertEqual(self.client.has_connected_input_devices(), True) dev2.UpdateProperties('org.bluez.Device1', {'Connected': dbus.Boolean(False, variant_level=1)}) - self.wait_for_mainloop() + self.wait_for_condition(lambda: self.client.has_connected_input_devices() == False) self.assertEqual(self.client.has_connected_input_devices(), False) def test_connectable_devices(self): -- cgit v1.2.1