Fix for tests

stratis-storage · Mar 24, 2023 · 3d49d61 · 3d49d61
1 parent d113d16
commit 3d49d61
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/tests/client-dbus/src/stratisd_client_dbus/_introspect.py b/tests/client-dbus/src/stratisd_client_dbus/_introspect.py
@@ -53,7 +53,8 @@
       <arg name="return_string" type="s" direction="out" />
     </method>
     <method name="StopPool">
-      <arg name="pool" type="o" direction="in" />
+      <arg name="id" type="s" direction="in" />
+      <arg name="id_type" type="s" direction="in" />
       <arg name="result" type="(bs)" direction="out" />
       <arg name="return_code" type="q" direction="out" />
       <arg name="return_string" type="s" direction="out" />

diff --git 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)