tests: Various improvements in DM tests

Faster pbkdf when creating LUKS device for testing, reducing
number of test cases and adding some additional checks.

Author: vojtechtrefny

src/plugins/dm.c

@@ -243,12 +243,6 @@ gchar* bd_dm_get_subsystem_from_name (const gchar *device_name, GError **error)
     gchar *subsystem = NULL;
     gchar *hyphen_pos = NULL;
 
-    if (geteuid () != 0) {
-        g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_NOT_ROOT,
-                     "Not running as root, cannot query DM device");
-        return NULL;
-    }
-
     task = dm_task_create (DM_DEVICE_INFO);
     if (!task) {
         g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_TASK,

tests/dm_test.py

@@ -22,10 +22,6 @@ def setUpClass(cls):
         else:
             BlockDev.reinit(cls.requested_plugins, True, None)
 
-class DevMapperPluginVersionCase(DevMapperTest):
-    @tag_test(TestTags.NOSTORAGE)
-    def test_plugin_version(self):
-        self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.DM), "libbd_dm.so.3")
 
 class DevMapperTestCase(DevMapperTest):
 
@@ -51,6 +47,7 @@ def _clean_up(self):
 
         os.unlink(self.dev_file)
 
+
 class DevMapperGetSubsystemFromName(DevMapperTestCase):
     def _destroy_lvm(self):
         run("vgremove --yes libbd_dm_tests --config \"devices {use_devicesfile = 0}\" >/dev/null 2>&1")
@@ -71,11 +68,12 @@ def test_get_subsystem_from_name_lvm(self):
     def test_get_subsystem_from_name_crypt(self):
         """Verify that it is possible to get luks device subsystem from its name"""
         self.addCleanup(self._destroy_crypt)
-        run("echo \"supersecretkey\" | cryptsetup luksFormat %s -" %self.loop_dev)
+        run("echo \"supersecretkey\" | cryptsetup luksFormat --pbkdf=pbkdf2 --pbkdf-force-iterations=1000 %s -" %self.loop_dev)
         run("echo \"supersecretkey\" | cryptsetup open %s libbd_dm_tests-subsystem_crypt --key-file=-" %self.loop_dev)
         subsystem = BlockDev.dm_get_subsystem_from_name("libbd_dm_tests-subsystem_crypt")
         self.assertEqual(subsystem, "CRYPT")
 
+
     def test_get_subsystem_from_name_linear(self):
         succ = BlockDev.dm_create_linear("testMap", self.loop_dev, 100, None)
         self.assertTrue(succ)
@@ -101,16 +99,20 @@ def test_get_subsystem_from_name_linear(self):
         with self.assertRaisesRegex(GLib.GError, "does not exist"):
             BlockDev.dm_get_subsystem_from_name("testMap")
 
+
 class DevMapperCreateRemoveLinear(DevMapperTestCase):
     @tag_test(TestTags.CORE)
     def test_create_remove_linear(self):
         """Verify that it is possible to create new linear mapping and remove it"""
 
         succ = BlockDev.dm_create_linear("testMap", self.loop_dev, 100, None)
         self.assertTrue(succ)
+        self.assertTrue(os.path.exists("/dev/mapper/testMap"))
 
         succ = BlockDev.dm_remove("testMap")
         self.assertTrue(succ)
+        self.assertFalse(os.path.exists("/dev/mapper/testMap"))
+
 
 class DevMapperMapExists(DevMapperTestCase):
     def test_map_exists(self):
@@ -140,6 +142,7 @@ def test_map_exists(self):
         succ = BlockDev.dm_map_exists("testMap", False, False)
         self.assertFalse(succ)
 
+
 class DevMapperNameNodeBijection(DevMapperTestCase):
     def test_name_node_bijection(self):
         """Verify that the map's node and map name points to each other"""
@@ -150,9 +153,11 @@ def test_name_node_bijection(self):
         self.assertEqual(BlockDev.dm_name_from_node(BlockDev.dm_node_from_name("testMap")),
                          "testMap")
 
-        self.assertTrue(succ)
 
-class DMDepsTest(DevMapperTest):
+class DMNoStorageTest(DevMapperTest):
+    @tag_test(TestTags.NOSTORAGE)
+    def test_plugin_version(self):
+        self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.DM), "libbd_dm.so.3")
 
     @tag_test(TestTags.NOSTORAGE)
     def test_missing_dependencies(self):