virstoragetest: Use strings for storage type and format in output data

Make it easier for the humans to read/compare the outputs. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2024-12-22 17:34:18 +03:00 · 2023-11-24 11:14:21 +01:00 · 2023-11-24 11:14:21 +01:00 · bc54376f09
commit bc54376f09
parent 60df39abc8
17 changed files with 60 additions and 60 deletions
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@ -187,8 +187,8 @@ testStorageChain(const void *args)
                          "capacity: %lld\n"
                          "encryption: %d\n"
                          "relPath:%s\n"
-                          "type:%d\n"
-                          "format:%d\n"
+                          "type:%s\n"
+                          "format:%s\n"
                          "protocol:%s\n"
                          "hostname:%s\n\n",
                          strippedPath,
@ -196,8 +196,8 @@ testStorageChain(const void *args)
                          elt->capacity,
                          !!elt->encryption,
                          strippedRelPath,
-                          elt->type,
-                          elt->format,
+                          NULLSTR(virStorageTypeToString(elt->type)),
+                          NULLSTR(virStorageFileFormatTypeToString(elt->format)),
                          virStorageNetProtocolTypeToString(elt->protocol),
                          NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL));
    }
--- a/tests/virstoragetestdata/out/directory-dir
+++ b/tests/virstoragetestdata/out/directory-dir
@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:3
-format:2
+type:dir
+format:dir
 protocol:none
 hostname:<null>
--- a/tests/virstoragetestdata/out/directory-none
+++ b/tests/virstoragetestdata/out/directory-none
@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:3
-format:2
+type:dir
+format:dir
 protocol:none
 hostname:<null>
--- a/tests/virstoragetestdata/out/directory-raw
+++ b/tests/virstoragetestdata/out/directory-raw
@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:3
-format:1
+type:dir
+format:raw
 protocol:none
 hostname:<null>
--- a/tests/virstoragetestdata/out/qcow2-auto_qcow2-qcow2_raw-raw
+++ b/tests/virstoragetestdata/out/qcow2-auto_qcow2-qcow2_raw-raw
@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:1
-format:1
+type:file
+format:raw
 protocol:none
 hostname:<null>
--- a/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative
+++ b/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative
@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:1
-format:1
+type:file
+format:raw
 protocol:none
 hostname:<null>
--- a/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw
+++ b/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw
@ -3,8 +3,8 @@ backingStoreRaw: nbd+tcp://example.org:6000/blah
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
-format:14
+type:file
+format:qcow2
 protocol:none
 hostname:<null>

@ -13,7 +13,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:4
-format:1
+type:network
+format:raw
 protocol:nbd
 hostname:example.org
--- a/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-auto
+++ b/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-auto
@ -3,8 +3,8 @@ backingStoreRaw: qcow2
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
-format:14
+type:file
+format:qcow2
 protocol:none
 hostname:<null>

@ -13,7 +13,7 @@ backingStoreRaw: <null>
 capacity: 1024
 encryption: 0
 relPath:qcow2
-type:1
-format:14
+type:file
+format:qcow2
 protocol:none
 hostname:<null>
--- a/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_qcow2-auto
+++ b/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_qcow2-auto
@ -3,8 +3,8 @@ backingStoreRaw: qcow2_qcow2-auto.qcow2
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
-format:14
+type:file
+format:qcow2
 protocol:none
 hostname:<null>

@ -13,8 +13,8 @@ backingStoreRaw: qcow2
 capacity: 1024
 encryption: 0
 relPath:qcow2_qcow2-auto.qcow2
-type:1
-format:14
+type:file
+format:qcow2
 protocol:none
 hostname:<null>

@ -23,7 +23,7 @@ backingStoreRaw: <null>
 capacity: 1024
 encryption: 0
 relPath:qcow2
-type:1
-format:14
+type:file
+format:qcow2
 protocol:none
 hostname:<null>
--- a/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-auto
+++ b/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-auto
@ -3,8 +3,8 @@ backingStoreRaw: qcow2_raw-auto.qcow2
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
-format:14
+type:file
+format:qcow2
 protocol:none
 hostname:<null>

@ -13,8 +13,8 @@ backingStoreRaw: raw
 capacity: 1024
 encryption: 0
 relPath:qcow2_raw-auto.qcow2
-type:1
-format:14
+type:file
+format:qcow2
 protocol:none
 hostname:<null>

@ -23,7 +23,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:raw
-type:1
-format:1
+type:file
+format:raw
 protocol:none
 hostname:<null>
--- a/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-raw
+++ b/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-raw
@ -3,8 +3,8 @@ backingStoreRaw: ABS_BUILDDIR/virstoragedata/qcow2
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
-format:14
+type:file
+format:qcow2
 protocol:none
 hostname:<null>

@ -13,8 +13,8 @@ backingStoreRaw: ABS_BUILDDIR/virstoragedata/raw
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
-format:14
+type:file
+format:qcow2
 protocol:none
 hostname:<null>

@ -23,7 +23,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:1
-format:1
+type:file
+format:raw
 protocol:none
 hostname:<null>
--- a/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative
+++ b/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative
@ -3,8 +3,8 @@ backingStoreRaw: raw
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
-format:14
+type:file
+format:qcow2
 protocol:none
 hostname:<null>

@ -13,7 +13,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:raw
-type:1
-format:1
+type:file
+format:raw
 protocol:none
 hostname:<null>
--- a/tests/virstoragetestdata/out/qcow2-symlinks
+++ b/tests/virstoragetestdata/out/qcow2-symlinks
@ -3,8 +3,8 @@ backingStoreRaw: ../sub/link1
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
-format:14
+type:file
+format:qcow2
 protocol:none
 hostname:<null>

@ -13,8 +13,8 @@ backingStoreRaw: ../raw
 capacity: 1024
 encryption: 0
 relPath:../sub/link1
-type:1
-format:14
+type:file
+format:qcow2
 protocol:none
 hostname:<null>

@ -23,7 +23,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:../raw
-type:1
-format:1
+type:file
+format:raw
 protocol:none
 hostname:<null>
--- a/tests/virstoragetestdata/out/qed-auto_raw
+++ b/tests/virstoragetestdata/out/qed-auto_raw
@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:1
-format:1
+type:file
+format:raw
 protocol:none
 hostname:<null>
--- a/tests/virstoragetestdata/out/qed-qed_raw
+++ b/tests/virstoragetestdata/out/qed-qed_raw
@ -3,8 +3,8 @@ backingStoreRaw: raw
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
-format:15
+type:file
+format:qed
 protocol:none
 hostname:<null>

@ -13,7 +13,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:raw
-type:1
-format:1
+type:file
+format:raw
 protocol:none
 hostname:<null>
--- a/tests/virstoragetestdata/out/raw-auto
+++ b/tests/virstoragetestdata/out/raw-auto
@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:1
-format:1
+type:file
+format:raw
 protocol:none
 hostname:<null>
--- a/tests/virstoragetestdata/out/raw-raw
+++ b/tests/virstoragetestdata/out/raw-raw
@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:1
-format:1
+type:file
+format:raw
 protocol:none
 hostname:<null>