diff --git a/tests/client-dbus/src/stratisd_client_dbus/_introspect.py b/tests/client-dbus/src/stratisd_client_dbus/_introspect.py index f3681959ca4..841ad7d5624 100644 --- a/tests/client-dbus/src/stratisd_client_dbus/_introspect.py +++ b/tests/client-dbus/src/stratisd_client_dbus/_introspect.py @@ -53,7 +53,8 @@ - + + diff --git a/tests/client-dbus/tests/udev/test_udev.py b/tests/client-dbus/tests/udev/test_udev.py index 4a7e6ec3fc6..483bee72ca7 100644 --- a/tests/client-dbus/tests/udev/test_udev.py +++ b/tests/client-dbus/tests/udev/test_udev.py @@ -601,12 +601,14 @@ def _simple_stop_test(self): num_devices = 2 device_tokens = self._lb_mgr.create_devices(num_devices) devnodes = self._lb_mgr.device_files(device_tokens) + pool_name1 = random_string(5) + pool_name2 = random_string(5) with OptionalKeyServiceContextManager(): self.wait_for_pools(0) - (_, (pool_object_path, _)) = create_pool(random_string(5), devnodes[:1]) - create_pool(random_string(5), devnodes[1:]) + create_pool(pool_name1, devnodes[:1]) + create_pool(pool_name2, devnodes[1:]) self.wait_for_pools(2) @@ -621,7 +623,10 @@ def _simple_stop_test(self): ((changed, _), exit_code, _) = Manager.Methods.StopPool( get_object(TOP_OBJECT), - {"pool": pool_object_path}, + { + "id": pool_name1, + "id_type": "name", + }, ) self.assertEqual(exit_code, 0) self.assertEqual(changed, True) @@ -684,22 +689,22 @@ def _simple_start_by_name_test(self): ) as key_desc: self.wait_for_pools(0) - (_, (pool_object_path_enc, _)) = create_pool( - "encrypted", devnodes[:2], key_description=key_desc[0] - ) - (_, (pool_object_path, _)) = create_pool("unencrypted", devnodes[2:]) + create_pool("encrypted", devnodes[:2], key_description=key_desc[0]) + create_pool("unencrypted", devnodes[2:]) self.wait_for_pools(2) ((changed, _), exit_code, _) = Manager.Methods.StopPool( get_object(TOP_OBJECT), - {"pool": pool_object_path_enc}, + {"id": "encrypted"}, + {"id_type": "name"}, ) self.assertEqual(exit_code, 0) self.assertEqual(changed, True) ((changed, _), exit_code, _) = Manager.Methods.StopPool( get_object(TOP_OBJECT), - {"pool": pool_object_path}, + {"id": "unencrypted"}, + {"id_type": "name"}, ) self.assertEqual(exit_code, 0) self.assertEqual(changed, True)