[PATCH 1/4] tests: storage: Use strict version of virStorageFileGetMetadata

[Peter Krempa <pkrempa@xxxxxxxxxx>]

Pass in 'true' as '@report_broken' of virStorageFileGetMetadata to make
it fail in the tests. The most important code paths (when starting the
VM) expect this function to fail rather than silently return partial
data. Switch the test to exercise this more important code path.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 tests/virstoragetest.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 407378bab4..73717b0460 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -103,7 +103,7 @@ testStorageFileGetMetadata(const char *path,

     def->path = g_strdup(path);

-    if (virStorageFileGetMetadata(def, uid, gid, false) < 0)
+    if (virStorageFileGetMetadata(def, uid, gid, true) < 0)
         return NULL;

     return g_steal_pointer(&def);
@@ -775,7 +775,7 @@ mymain(void)
     qcow2.expBackingStoreRaw = datadir "/bogus";

     /* Qcow2 file with missing backing file but specified type */
-    TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_WARN);
+    TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_FAIL);

     /* Rewrite qcow2 to a missing backing file, without backing type */
     virCommandFree(cmd);
@@ -785,7 +785,7 @@ mymain(void)
         ret = -1;

     /* Qcow2 file with missing backing file and no specified type */
-    TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_WARN);
+    TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_FAIL);

     /* Rewrite qcow2 to use an nbd: protocol as backend */
     virCommandFree(cmd);
@@ -916,7 +916,7 @@ mymain(void)
     qcow2.expBackingStoreRaw = "qcow2";

     /* Behavior of an infinite loop chain */
-    TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_WARN);
+    TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_FAIL);

     /* Rewrite wrap and qcow2 to be mutually-referential loop */
     virCommandFree(cmd);
@@ -933,7 +933,7 @@ mymain(void)
     qcow2.expBackingStoreRaw = "wrap";

     /* Behavior of an infinite loop chain */
-    TEST_CHAIN(abswrap, VIR_STORAGE_FILE_QCOW2, (&wrap, &qcow2), EXP_WARN);
+    TEST_CHAIN(abswrap, VIR_STORAGE_FILE_QCOW2, (&wrap, &qcow2), EXP_FAIL);

     /* Rewrite qcow2 to use an rbd: protocol as backend */
     virCommandFree(cmd);
-- 
2.23.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list