Finish fixing tests

stratis-storage · Aug 21, 2019 · fdca5b9 · fdca5b9
1 parent a53205f
commit fdca5b9
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 60 deletions.
diff --git a/src/dbus_api/api.rs b/src/dbus_api/api.rs
@@ -172,7 +172,7 @@ fn get_base_tree<'a>(dbus_context: DbusContext) -> (Tree<MTFn<TData>, TData>, db
         // a(o): Array of object paths for block devices
         //
         // Rust representation: (bool, (dbus::Path, Vec<dbus::Path>))
-        .out_arg(("result", "(b(oao)"))
+        .out_arg(("result", "(b(oao))"))
         .out_arg(("return_code", "q"))
         .out_arg(("return_string", "s"));
 

diff --git a/tests/client-dbus/tests/dbus/filesystem/test_properties.py b/tests/client-dbus/tests/dbus/filesystem/test_properties.py
@@ -42,7 +42,7 @@ def setUp(self):
         super().setUp()
         self._fs_name = "fs"
         self._proxy = get_object(TOP_OBJECT)
-        ((self._pool_object_path, _), _, _) = Manager.Methods.CreatePool(
+        ((_, (self._pool_object_path, _)), _, _) = Manager.Methods.CreatePool(
             self._proxy,
             {
                 "name": self._POOLNAME,
@@ -51,7 +51,7 @@ def setUp(self):
             },
         )
         self._pool_object = get_object(self._pool_object_path)
-        (created, _, _) = Pool.Methods.CreateFilesystems(
+        ((_, created), _, _) = Pool.Methods.CreateFilesystems(
             self._pool_object, {"specs": [self._fs_name]}
         )
         self._filesystem_object_path = created[0][0]

diff --git a/tests/client-dbus/tests/dbus/filesystem/test_rename.py b/tests/client-dbus/tests/dbus/filesystem/test_rename.py
@@ -45,7 +45,7 @@ def setUp(self):
         super().setUp()
         self._fs_name = "fs"
         self._proxy = get_object(TOP_OBJECT)
-        ((self._pool_object_path, _), _, _) = Manager.Methods.CreatePool(
+        ((_, (self._pool_object_path, _)), _, _) = Manager.Methods.CreatePool(
             self._proxy,
             {
                 "name": self._POOLNAME,
@@ -54,7 +54,7 @@ def setUp(self):
             },
         )
         self._pool_object = get_object(self._pool_object_path)
-        (created, _, _) = Pool.Methods.CreateFilesystems(
+        ((_, created), _, _) = Pool.Methods.CreateFilesystems(
             self._pool_object, {"specs": [self._fs_name]}
         )
         self._filesystem_object_path = created[0][0]
@@ -65,12 +65,13 @@ def testNullMapping(self):
         Test rename to same name.
         """
         filesystem = get_object(self._filesystem_object_path)
-        (result, rc, _) = Filesystem.Methods.SetName(
+        ((is_some, result), rc, _) = Filesystem.Methods.SetName(
             filesystem, {"name": self._fs_name}
         )
 
         self.assertEqual(rc, StratisdErrors.OK)
-        self.assertFalse(result)
+        self.assertFalse(is_some)
+        self.assertEqual(result, "0" * 32)
 
     def testNewName(self):
         """

diff --git a/tests/client-dbus/tests/dbus/manager/test_create.py b/tests/client-dbus/tests/dbus/manager/test_create.py
@@ -52,7 +52,7 @@ def testCreate(self):
         If rc is OK, then pool must exist.
         """
         devs = _DEVICE_STRATEGY()
-        ((_, _, (poolpath, devnodes)), rc, _) = Manager.Methods.CreatePool(
+        ((_, (poolpath, devnodes)), rc, _) = Manager.Methods.CreatePool(
             self._proxy,
             {"name": self._POOLNAME, "redundancy": (True, 0), "devices": devs},
         )
@@ -121,16 +121,16 @@ def testCreate(self):
             ObjectManager.Methods.GetManagedObjects(self._proxy, {})
         )
 
-        (_, rc, _) = Manager.Methods.CreatePool(
+        ((is_some, _), rc, _) = Manager.Methods.CreatePool(
             self._proxy,
             {
                 "name": self._POOLNAME,
                 "redundancy": (True, 0),
                 "devices": _DEVICE_STRATEGY(),
             },
         )
-        expected_rc = StratisdErrors.ALREADY_EXISTS
-        self.assertEqual(rc, expected_rc)
+        self.assertEqual(rc, StratisdErrors.OK)
+        self.assertFalse(is_some)
 
         managed_objects = ObjectManager.Methods.GetManagedObjects(self._proxy, {})
         pools2 = [x for x in pools().search(managed_objects)]

diff --git a/tests/client-dbus/tests/dbus/manager/test_destroy.py b/tests/client-dbus/tests/dbus/manager/test_destroy.py
@@ -127,7 +127,7 @@ def setUp(self):
         """
         super().setUp()
         self._proxy = get_object(TOP_OBJECT)
-        ((poolpath, _), _, _) = Manager.Methods.CreatePool(
+        ((_, (poolpath, _)), _, _) = Manager.Methods.CreatePool(
             self._proxy,
             {
                 "name": self._POOLNAME,
@@ -145,9 +145,9 @@ def testExecution(self):
         managed_objects = ObjectManager.Methods.GetManagedObjects(self._proxy, {})
         (pool, _) = next(pools(props={"Name": self._POOLNAME}).search(managed_objects))
 
-        (result, rc, _) = Manager.Methods.DestroyPool(self._proxy, {"pool": pool})
+        ((is_some, _), rc, _) = Manager.Methods.DestroyPool(self._proxy, {"pool": pool})
         self.assertEqual(rc, StratisdErrors.BUSY)
-        self.assertEqual(result, False)
+        self.assertFalse(is_some)
 
         managed_objects = ObjectManager.Methods.GetManagedObjects(self._proxy, {})
         (pool1, _) = next(pools(props={"Name": self._POOLNAME}).search(managed_objects))
@@ -181,10 +181,10 @@ def testExecution(self):
         managed_objects = ObjectManager.Methods.GetManagedObjects(self._proxy, {})
         (pool, _) = next(pools(props={"Name": self._POOLNAME}).search(managed_objects))
 
-        (result, rc, _) = Manager.Methods.DestroyPool(self._proxy, {"pool": pool})
+        ((is_some, _), rc, _) = Manager.Methods.DestroyPool(self._proxy, {"pool": pool})
 
         self.assertEqual(rc, StratisdErrors.OK)
-        self.assertEqual(result, True)
+        self.assertTrue(is_some)
 
         managed_objects = ObjectManager.Methods.GetManagedObjects(self._proxy, {})
         self.assertIsNone(

diff --git a/tests/client-dbus/tests/dbus/pool/test_add_cache_devs.py b/tests/client-dbus/tests/dbus/pool/test_add_cache_devs.py
@@ -89,14 +89,12 @@ def testSomeDevs(self):
         else:
             self.assertEqual(num_devices_added, 0)
 
-        blockdev_uuids = frozenset(result)
+        blockdev_paths = frozenset(result)
 
         # blockdevs exported on the D-Bus are exactly those added
         blockdevs2 = list(blockdevs(props={"Pool": pool}).search(managed_objects))
-        blockdevs2_uuids = frozenset(
-            [data["org.storage.stratis1.blockdev"]["Uuid"] for (_, data) in blockdevs2]
-        )
-        self.assertEqual(blockdevs2_uuids, blockdev_uuids)
+        blockdevs2_paths = frozenset([op for (op, _) in blockdevs2])
+        self.assertEqual(blockdevs2_paths, blockdev_paths)
 
         # no duplicates in the object paths
         self.assertEqual(len(blockdevs2), num_devices_added)
@@ -132,7 +130,7 @@ def setUp(self):
             },
         )
         self._pool_object = get_object(poolpath)
-        self._devuuids = frozenset([devuuid for devuuid in devs])
+        self._devpaths = frozenset([devpath for devpath in devs])
         Manager.Methods.ConfigureSimulator(self._proxy, {"denominator": 8})
 
     def testEmptyDevs(self):
@@ -143,7 +141,7 @@ def testEmptyDevs(self):
         (pool, _) = next(pools(props={"Name": self._POOLNAME}).search(managed_objects))
 
         blockdevs1 = blockdevs(props={"Pool": pool, "Tier": 0}).search(managed_objects)
-        self.assertEqual(self._devuuids, frozenset(op for (op, _) in blockdevs1))
+        self.assertEqual(self._devpaths, frozenset(op for (op, _) in blockdevs1))
         blockdevs2 = blockdevs(props={"Pool": pool, "Tier": 1}).search(managed_objects)
         self.assertEqual(list(blockdevs2), [])
 
@@ -154,7 +152,7 @@ def testEmptyDevs(self):
 
         managed_objects = ObjectManager.Methods.GetManagedObjects(self._proxy, {})
         blockdevs3 = blockdevs(props={"Pool": pool}).search(managed_objects)
-        self.assertEqual(frozenset(op for (op, _) in blockdevs3), self._devuuids)
+        self.assertEqual(frozenset(op for (op, _) in blockdevs3), self._devpaths)
 
     def testSomeDevs(self):
         """
@@ -164,7 +162,7 @@ def testSomeDevs(self):
         (pool, _) = next(pools(props={"Name": self._POOLNAME}).search(managed_objects))
 
         blockdevs1 = blockdevs(props={"Pool": pool, "Tier": 0}).search(managed_objects)
-        self.assertEqual(self._devuuids, frozenset(op for (op, _) in blockdevs1))
+        self.assertEqual(self._devpaths, frozenset(op for (op, _) in blockdevs1))
         (result, rc, _) = Pool.Methods.AddCacheDevs(
             self._pool_object, {"devices": _DEVICE_STRATEGY()}
         )
@@ -195,10 +193,4 @@ def testSomeDevs(self):
 
         # The number of datadevs has remained the same
         blockdevs5 = blockdevs(props={"Pool": pool, "Tier": 0}).search(managed_objects)
-        self.assertEqual(
-            frozenset(
-                data["org.storage.stratis1.blockdev"]["Uuid"]
-                for (_, data) in blockdevs5
-            ),
-            self._devuuids,
-        )
+        self.assertEqual(frozenset(op for (op, _) in blockdevs5), self._devpaths)
diff --git a/tests/client-dbus/tests/dbus/pool/test_add_data_devs.py b/tests/client-dbus/tests/dbus/pool/test_add_data_devs.py
@@ -44,7 +44,7 @@ def setUp(self):
         """
         super().setUp()
         self._proxy = get_object(TOP_OBJECT)
-        ((_, ((poolpath, _), _)), _, _) = Manager.Methods.CreatePool(
+        ((_, (poolpath, _)), _, _) = Manager.Methods.CreatePool(
             self._proxy,
             {"name": self._POOLNAME, "redundancy": (True, 0), "devices": []},
         )

diff --git a/tests/client-dbus/tests/dbus/pool/test_create_filesystem.py b/tests/client-dbus/tests/dbus/pool/test_create_filesystem.py
@@ -46,7 +46,7 @@ def setUp(self):
         super().setUp()
         self._proxy = get_object(TOP_OBJECT)
         self._devs = _DEVICE_STRATEGY()
-        ((_, ((poolpath, _), _)), _, _) = Manager.Methods.CreatePool(
+        ((_, (poolpath, _)), _, _) = Manager.Methods.CreatePool(
             self._proxy,
             {"name": self._POOLNAME, "redundancy": (True, 0), "devices": self._devs},
         )
@@ -63,7 +63,7 @@ def testCreate(self):
             self._pool_object, {"specs": []}
         )
 
-        self.assertEqual(is_some, False)
+        self.assertFalse(is_some)
         self.assertEqual(len(result), 0)
         self.assertEqual(rc, StratisdErrors.OK)
 
@@ -83,7 +83,7 @@ def testDuplicateSpecs(self):
             self._pool_object, {"specs": [new_name, new_name]}
         )
 
-        self.assertEqual(is_some, True)
+        self.assertTrue(is_some)
         self.assertEqual(len(result), 1)
         self.assertEqual(rc, StratisdErrors.OK)
 
@@ -111,7 +111,7 @@ def setUp(self):
         super().setUp()
         self._proxy = get_object(TOP_OBJECT)
         self._devs = _DEVICE_STRATEGY()
-        ((_, ((poolpath, _), _)), _, _) = Manager.Methods.CreatePool(
+        ((_, (poolpath, _)), _, _) = Manager.Methods.CreatePool(
             self._proxy,
             {"name": self._POOLNAME, "redundancy": (True, 0), "devices": self._devs},
         )
@@ -131,7 +131,7 @@ def testCreate(self):
         )
 
         self.assertEqual(rc, StratisdErrors.OK)
-        self.assertEqual(is_some, False)
+        self.assertFalse(is_some)
         self.assertEqual(len(result), 0)
 
         result = filesystems().search(
@@ -151,10 +151,10 @@ def testCreateOne(self):
         )
 
         self.assertEqual(rc, StratisdErrors.OK)
-        self.assertEqual(is_some, True)
+        self.assertTrue(is_some)
         self.assertEqual(len(result), 1)
 
-        (_, fs_name, _) = result[0]
+        (_, fs_name) = result[0]
         self.assertEqual(fs_name, new_name)
 
         result = filesystems().search(
@@ -174,7 +174,7 @@ def testCreateWithConflict(self):
         )
 
         self.assertEqual(rc, StratisdErrors.OK)
-        self.assertEqual(is_some, True)
+        self.assertTrue(is_some)
         self.assertEqual(len(result), 0)
         self.assertEqual(result[0][1], "newname")
 
@@ -194,7 +194,7 @@ def testCreateMultiple(self):
         )
 
         self.assertEqual(rc, StratisdErrors.ERROR)
-        self.assertEqual(is_some, False)
+        self.assertFalse(is_some)
         self.assertEqual(len(result), 0)
 
         result = filesystems().search(

diff --git a/tests/client-dbus/tests/dbus/pool/test_create_snapshot.py b/tests/client-dbus/tests/dbus/pool/test_create_snapshot.py
@@ -46,7 +46,7 @@ def setUp(self):
         super().setUp()
         self._proxy = get_object(TOP_OBJECT)
         self._devs = _DEVICE_STRATEGY()
-        ((_, ((poolpath, _), _)), _, _) = Manager.Methods.CreatePool(
+        ((_, (poolpath, _)), _, _) = Manager.Methods.CreatePool(
             self._proxy,
             {"name": self._POOLNAME, "redundancy": (True, 0), "devices": self._devs},
         )

diff --git a/tests/client-dbus/tests/dbus/pool/test_destroy_filesystem.py b/tests/client-dbus/tests/dbus/pool/test_destroy_filesystem.py
@@ -44,7 +44,7 @@ def setUp(self):
         super().setUp()
         self._proxy = get_object(TOP_OBJECT)
         self._devs = _DEVICE_STRATEGY()
-        ((_, ((poolpath, _), _)), _, _) = Manager.Methods.CreatePool(
+        ((_, (poolpath, _)), _, _) = Manager.Methods.CreatePool(
             self._proxy,
             {"name": self._POOLNAME, "redundancy": (True, 0), "devices": self._devs},
         )
@@ -74,13 +74,10 @@ def testDestroyOne(self):
         Test calling with a non-existant object path. This should succeed,
         because at the end the filesystem is not there.
         """
-        (
-            (_, (result_changed, result_unchanged)),
-            rc,
-            _,
-        ) = Pool.Methods.DestroyFilesystems(self._pool_object, {"filesystems": ["/"]})
-        self.assertEqual(len(result_changed), 0)
-        self.assertEqual(len(result_unchanged), 1)
+        ((_, result), rc, _) = Pool.Methods.DestroyFilesystems(
+            self._pool_object, {"filesystems": ["/"]}
+        )
+        self.assertEqual(len(result), 0)
         self.assertEqual(rc, StratisdErrors.OK)
 
         result = filesystems().search(
@@ -104,12 +101,12 @@ def setUp(self):
         super().setUp()
         self._proxy = get_object(TOP_OBJECT)
         self._devs = _DEVICE_STRATEGY()
-        ((_, ((self._poolpath, _), _)), _, _) = Manager.Methods.CreatePool(
+        ((_, (self._poolpath, _)), _, _) = Manager.Methods.CreatePool(
             self._proxy,
             {"name": self._POOLNAME, "redundancy": (True, 0), "devices": self._devs},
         )
         self._pool_object = get_object(self._poolpath)
-        (self._filesystems, _, _) = Pool.Methods.CreateFilesystems(
+        ((_, self._filesystems), _, _) = Pool.Methods.CreateFilesystems(
             self._pool_object, {"specs": [(self._VOLNAME, "", None)]}
         )
         Manager.Methods.ConfigureSimulator(self._proxy, {"denominator": 8})
@@ -120,10 +117,11 @@ def testDestroyOne(self):
         should always succeed.
         """
         fs_object_path = self._filesystems[0][0]
-        (result, rc, _) = Pool.Methods.DestroyFilesystems(
+        ((is_some, result), rc, _) = Pool.Methods.DestroyFilesystems(
             self._pool_object, {"filesystems": [fs_object_path]}
         )
 
+        self.assertTrue(is_some)
         self.assertEqual(len(result), 1)
         self.assertEqual(rc, StratisdErrors.OK)
 
@@ -139,10 +137,11 @@ def testDestroyTwo(self):
         returned.
         """
         fs_object_path = self._filesystems[0][0]
-        (result, rc, _) = Pool.Methods.DestroyFilesystems(
+        ((is_some, result), rc, _) = Pool.Methods.DestroyFilesystems(
             self._pool_object, {"filesystems": [fs_object_path, "/"]}
         )
 
+        self.assertTrue(is_some)
         self.assertEqual(len(result), 1)
         self.assertEqual(rc, StratisdErrors.OK)
 

diff --git a/tests/client-dbus/tests/dbus/pool/test_rename.py b/tests/client-dbus/tests/dbus/pool/test_rename.py
@@ -43,7 +43,7 @@ def setUp(self):
         """
         super().setUp()
         self._proxy = get_object(TOP_OBJECT)
-        ((_, _, (self._pool_object_path, _)), _, _) = Manager.Methods.CreatePool(
+        ((_, (self._pool_object_path, _)), _, _) = Manager.Methods.CreatePool(
             self._proxy,
             {
                 "name": self._POOLNAME,
@@ -58,12 +58,12 @@ def testNullMapping(self):
         """
         Test rename to same name.
         """
-        (result, rc, _) = Pool.Methods.SetName(
+        ((is_some, _), rc, _) = Pool.Methods.SetName(
             self._pool_object, {"name": self._POOLNAME}
         )
 
         self.assertEqual(rc, StratisdErrors.OK)
-        self.assertFalse(result)
+        self.assertFalse(is_some)
 
         managed_objects = ObjectManager.Methods.GetManagedObjects(self._proxy, {})
         result = next(
@@ -79,9 +79,11 @@ def testNewName(self):
         """
         new_name = "new"
 
-        (result, rc, _) = Pool.Methods.SetName(self._pool_object, {"name": new_name})
+        ((is_some, _), rc, _) = Pool.Methods.SetName(
+            self._pool_object, {"name": new_name}
+        )
 
-        self.assertTrue(result)
+        self.assertTrue(is_some)
         self.assertEqual(rc, StratisdErrors.OK)
 
         managed_objects = ObjectManager.Methods.GetManagedObjects(self._proxy, {})