Various test fixes

docs/libblockdev-docs.xml.in

@@ -161,6 +161,31 @@ cat dist/libblockdev.spec.in | grep BuildRequires: | cut -f2 -d: | cut -f2 -d' '
 
       is equivalent to `make test-all'.
     </para>
+
+    <para>
+      To get full coverage report for the C code the LCOV tool can be used:
+
+      <screen><userinput>./autogen.sh</userinput></screen>
+      <screen><userinput>./configure CFLAGS="-O0 -g --coverage" LDFLAGS="--coverage" --prefix=/usr</userinput></screen>
+      <screen><userinput>make -j</userinput></screen>
+
+      to configure and build the project with coverage enabled, run
+
+      <screen><userinput>lcov --directory . --zerocounters</userinput></screen>
+      <screen><userinput>lcov --directory . --capture --initial --output-file coverage-base.info</userinput></screen>
+
+      to configure lcov, run tests as usual with
+
+      <screen><userinput>sudo python3 tests/run_tests.py --include-tags all</userinput></screen>
+
+      and produce the HTML report using
+
+      <screen><userinput>lcov --directory . --capture --output-file coverage-test.info</userinput></screen>
+      <screen><userinput>lcov --remove coverage-test.info  '/usr/*'  --output-file coverage-filtered.info</userinput></screen>
+      <screen><userinput>genhtml coverage-filtered.info --output-directory coverage-report --title "libblockdev Coverage Report" --show-details --legend</userinput></screen>
+
+    </para>
+
   </chapter>
 
   <xi:include href="3.0-api-changes.xml"><xi:fallback /></xi:include>

src/lib/plugin_apis/smart.api

@@ -42,7 +42,7 @@ typedef enum {
  * Returns: whether the @tech-@mode combination is available -- supported by the
  *          plugin implementation and having all the runtime dependencies available
  */
-gboolean bd_smart_is_tech_avail (BDSmartTechMode tech, G_GNUC_UNUSED guint64 mode, GError **error);
+gboolean bd_smart_is_tech_avail (BDSmartTech tech, G_GNUC_UNUSED guint64 mode, GError **error);
 
 /* BpG-skip */
 /**

src/plugins/fs/generic.c

@@ -1305,7 +1305,7 @@ gboolean bd_fs_check (const gchar *device, const gchar *fstype, GError **error)
  * Tech category: always available
  */
 gboolean bd_fs_check_label (const gchar *fstype, const gchar *label, GError **error) {
-    if (!fstype) {
+    if (!fstype || strlen (fstype) == 0) {
         g_set_error (error, BD_FS_ERROR, BD_FS_ERROR_NOFS,
                      "Filesystem type must be specified to check label format");
         return FALSE;
@@ -1352,7 +1352,7 @@ gboolean bd_fs_set_label (const gchar *device, const gchar *label, const gchar *
  * Tech category: always available
  */
 gboolean bd_fs_check_uuid (const gchar *fstype, const gchar *uuid, GError **error) {
-    if (!fstype) {
+    if (!fstype || strlen (fstype) == 0) {
         g_set_error (error, BD_FS_ERROR, BD_FS_ERROR_NOFS,
                      "Filesystem type must be specified to check UUID format");
         return FALSE;

src/plugins/lvm/lvm-common.c

@@ -850,3 +850,124 @@ gboolean bd_lvm_vgcfgbackup (const gchar *vg_name, const gchar *backup_file, con
 gboolean bd_lvm_vgcfgrestore (const gchar *vg_name, const gchar *backup_file, const BDExtraArg **extra, GError **error) {
     return _vgcfgbackup_restore ("vgcfgrestore", vg_name, backup_file, extra, error);
 }
+
+/**
+ * bd_lvm_cache_stats:
+ * @vg_name: name of the VG containing the @cached_lv
+ * @cached_lv: cached LV to get stats for
+ * @error: (out) (optional): place to store error (if any)
+ *
+ * Returns: stats for the @cached_lv or %NULL in case of error
+ *
+ * Tech category: %BD_LVM_TECH_CACHE-%BD_LVM_TECH_MODE_QUERY
+ */
+BDLVMCacheStats* bd_lvm_cache_stats (const gchar *vg_name, const gchar *cached_lv, GError **error) {
+    struct dm_pool *pool = NULL;
+    struct dm_task *task = NULL;
+    struct dm_info info;
+    struct dm_status_cache *status = NULL;
+    gchar *map_name = NULL;
+    guint64 start = 0;
+    guint64 length = 0;
+    gchar *type = NULL;
+    gchar *params = NULL;
+    BDLVMCacheStats *ret = NULL;
+    BDLVMLVdata *lvdata = NULL;
+
+    lvdata = bd_lvm_lvinfo (vg_name, cached_lv, error);
+    if (!lvdata)
+        return NULL;
+
+    pool = dm_pool_create ("bd-pool", 20);
+
+    if (g_strcmp0 (lvdata->segtype, "thin-pool") == 0)
+        map_name = dm_build_dm_name (pool, vg_name, lvdata->data_lv, NULL);
+    else
+        /* translate the VG+LV name into the DM map name */
+        map_name = dm_build_dm_name (pool, vg_name, cached_lv, NULL);
+
+    bd_lvm_lvdata_free (lvdata);
+
+    task = dm_task_create (DM_DEVICE_STATUS);
+    if (!task) {
+        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_DM_ERROR,
+                     "Failed to create DM task for the cache map '%s': ", map_name);
+        dm_pool_destroy (pool);
+        return NULL;
+    }
+
+    if (dm_task_set_name (task, map_name) == 0) {
+        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_DM_ERROR,
+                     "Failed to create DM task for the cache map '%s': ", map_name);
+        dm_task_destroy (task);
+        dm_pool_destroy (pool);
+        return NULL;
+    }
+
+    if (dm_task_run (task) == 0) {
+        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_DM_ERROR,
+                     "Failed to run the DM task for the cache map '%s': ", map_name);
+        dm_task_destroy (task);
+        dm_pool_destroy (pool);
+        return NULL;
+    }
+
+    if (dm_task_get_info (task, &info) == 0) {
+        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_DM_ERROR,
+                     "Failed to get task info for the cache map '%s': ", map_name);
+        dm_task_destroy (task);
+        dm_pool_destroy (pool);
+        return NULL;
+    }
+
+    if (!info.exists) {
+        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_CACHE_NOCACHE,
+                     "The cache map '%s' doesn't exist: ", map_name);
+        dm_task_destroy (task);
+        dm_pool_destroy (pool);
+        return NULL;
+    }
+
+    dm_get_next_target (task, NULL, &start, &length, &type, &params);
+
+    if (dm_get_status_cache (pool, params, &status) == 0) {
+        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_CACHE_INVAL,
+                     "Failed to get status of the cache map '%s': ", map_name);
+        dm_task_destroy (task);
+        dm_pool_destroy (pool);
+        return NULL;
+    }
+
+    ret = g_new0 (BDLVMCacheStats, 1);
+    ret->block_size = status->block_size * SECTOR_SIZE;
+    ret->cache_size = status->total_blocks * ret->block_size;
+    ret->cache_used = status->used_blocks * ret->block_size;
+
+    ret->md_block_size = status->metadata_block_size * SECTOR_SIZE;
+    ret->md_size = status->metadata_total_blocks * ret->md_block_size;
+    ret->md_used = status->metadata_used_blocks * ret->md_block_size;
+
+    ret->read_hits = status->read_hits;
+    ret->read_misses = status->read_misses;
+    ret->write_hits = status->write_hits;
+    ret->write_misses = status->write_misses;
+
+    if (status->feature_flags & DM_CACHE_FEATURE_WRITETHROUGH)
+        ret->mode = BD_LVM_CACHE_MODE_WRITETHROUGH;
+    else if (status->feature_flags & DM_CACHE_FEATURE_WRITEBACK)
+        ret->mode = BD_LVM_CACHE_MODE_WRITEBACK;
+    else {
+        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_CACHE_INVAL,
+                      "Failed to determine status of the cache from '%"G_GUINT64_FORMAT"': ",
+                      status->feature_flags);
+        dm_task_destroy (task);
+        dm_pool_destroy (pool);
+        bd_lvm_cache_stats_free (ret);
+        return NULL;
+    }
+
+    dm_task_destroy (task);
+    dm_pool_destroy (pool);
+
+    return ret;
+}

src/plugins/lvm/lvm-dbus.c

@@ -3697,133 +3697,6 @@ gchar* bd_lvm_cache_pool_name (const gchar *vg_name, const gchar *cached_lv, GEr
     return pool_name;
 }
 
-/**
- * bd_lvm_cache_stats:
- * @vg_name: name of the VG containing the @cached_lv
- * @cached_lv: cached LV to get stats for
- * @error: (out) (optional): place to store error (if any)
- *
- * Returns: stats for the @cached_lv or %NULL in case of error
- *
- * Tech category: %BD_LVM_TECH_CACHE-%BD_LVM_TECH_MODE_QUERY
- */
-BDLVMCacheStats* bd_lvm_cache_stats (const gchar *vg_name, const gchar *cached_lv, GError **error) {
-    struct dm_pool *pool = NULL;
-    struct dm_task *task = NULL;
-    struct dm_info info;
-    struct dm_status_cache *status = NULL;
-    gchar *map_name = NULL;
-    guint64 start = 0;
-    guint64 length = 0;
-    gchar *type = NULL;
-    gchar *params = NULL;
-    BDLVMCacheStats *ret = NULL;
-    BDLVMLVdata *lvdata = NULL;
-
-    if (geteuid () != 0) {
-        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_NOT_ROOT,
-                     "Not running as root, cannot query DM maps");
-        return NULL;
-    }
-
-    lvdata = bd_lvm_lvinfo (vg_name, cached_lv, error);
-    if (!lvdata)
-        return NULL;
-
-    pool = dm_pool_create ("bd-pool", 20);
-
-    if (g_strcmp0 (lvdata->segtype, "thin-pool") == 0)
-        map_name = dm_build_dm_name (pool, vg_name, lvdata->data_lv, NULL);
-    else
-        /* translate the VG+LV name into the DM map name */
-        map_name = dm_build_dm_name (pool, vg_name, cached_lv, NULL);
-
-    bd_lvm_lvdata_free (lvdata);
-
-    task = dm_task_create (DM_DEVICE_STATUS);
-    if (!task) {
-        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_DM_ERROR,
-                     "Failed to create DM task for the cache map '%s': ", map_name);
-        dm_pool_destroy (pool);
-        return NULL;
-    }
-
-    if (dm_task_set_name (task, map_name) == 0) {
-        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_DM_ERROR,
-                     "Failed to create DM task for the cache map '%s': ", map_name);
-        dm_task_destroy (task);
-        dm_pool_destroy (pool);
-        return NULL;
-    }
-
-    if (dm_task_run (task) == 0) {
-        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_DM_ERROR,
-                     "Failed to run the DM task for the cache map '%s': ", map_name);
-        dm_task_destroy (task);
-        dm_pool_destroy (pool);
-        return NULL;
-    }
-
-    if (dm_task_get_info (task, &info) == 0) {
-        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_DM_ERROR,
-                     "Failed to get task info for the cache map '%s': ", map_name);
-        dm_task_destroy (task);
-        dm_pool_destroy (pool);
-        return NULL;
-    }
-
-    if (!info.exists) {
-        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_CACHE_NOCACHE,
-                     "The cache map '%s' doesn't exist: ", map_name);
-        dm_task_destroy (task);
-        dm_pool_destroy (pool);
-        return NULL;
-    }
-
-    dm_get_next_target (task, NULL, &start, &length, &type, &params);
-
-    if (dm_get_status_cache (pool, params, &status) == 0) {
-        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_CACHE_INVAL,
-                     "Failed to get status of the cache map '%s': ", map_name);
-        dm_task_destroy (task);
-        dm_pool_destroy (pool);
-        return NULL;
-    }
-
-    ret = g_new0 (BDLVMCacheStats, 1);
-    ret->block_size = status->block_size * SECTOR_SIZE;
-    ret->cache_size = status->total_blocks * ret->block_size;
-    ret->cache_used = status->used_blocks * ret->block_size;
-
-    ret->md_block_size = status->metadata_block_size * SECTOR_SIZE;
-    ret->md_size = status->metadata_total_blocks * ret->md_block_size;
-    ret->md_used = status->metadata_used_blocks * ret->md_block_size;
-
-    ret->read_hits = status->read_hits;
-    ret->read_misses = status->read_misses;
-    ret->write_hits = status->write_hits;
-    ret->write_misses = status->write_misses;
-
-    if (status->feature_flags & DM_CACHE_FEATURE_WRITETHROUGH)
-        ret->mode = BD_LVM_CACHE_MODE_WRITETHROUGH;
-    else if (status->feature_flags & DM_CACHE_FEATURE_WRITEBACK)
-        ret->mode = BD_LVM_CACHE_MODE_WRITEBACK;
-    else {
-        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_CACHE_INVAL,
-                      "Failed to determine status of the cache from '%"G_GUINT64_FORMAT"': ",
-                      status->feature_flags);
-        dm_task_destroy (task);
-        dm_pool_destroy (pool);
-        bd_lvm_cache_stats_free (ret);
-        return NULL;
-    }
-
-    dm_task_destroy (task);
-    dm_pool_destroy (pool);
-
-    return ret;
-}
-
 /**
  * bd_lvm_thpool_convert:
  * @vg_name: name of the VG to create the new thin pool in