10:37 a.m.
libvirt always uses an absolute path to address the top image of an
image chain. Our storage test tests also the relative path which won't
ever be used. Additionally it makes the test more complicated.
---
tests/virstoragetest.c | 79 +++++++++++++-------------------------------------
1 file changed, 20 insertions(+), 59 deletions(-)
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index a787cc9..002df68 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -739,17 +739,12 @@ mymain(void)
#define VIR_FLATTEN_2(...) __VA_ARGS__
#define VIR_FLATTEN_1(_1) VIR_FLATTEN_2 _1
-#define TEST_CHAIN(id, relstart, absstart, format, chain1, flags1, \
- chain2, flags2, chain3, flags3, chain4, flags4) \
+#define TEST_CHAIN(id, path, format, chain1, flags1, chain2, flags2) \
do { \
- TEST_ONE_CHAIN(#id "a", relstart, format, flags1, \
+ TEST_ONE_CHAIN(#id "a", path, format, flags1 | ABS_START, \
VIR_FLATTEN_1(chain1)); \
- TEST_ONE_CHAIN(#id "b", relstart, format, flags2, \
+ TEST_ONE_CHAIN(#id "b", path, format, flags2 | ABS_START, \
VIR_FLATTEN_1(chain2)); \
- TEST_ONE_CHAIN(#id "c", absstart, format, flags3 | ABS_START,\
- VIR_FLATTEN_1(chain3)); \
- TEST_ONE_CHAIN(#id "d", absstart, format, flags4 | ABS_START,\
- VIR_FLATTEN_1(chain4)); \
} while (0)
/* The actual tests, in several groups. */
@@ -765,14 +760,10 @@ mymain(void)
.type = VIR_STORAGE_TYPE_FILE,
.format = VIR_STORAGE_FILE_RAW,
};
- TEST_CHAIN(1, "raw", absraw, VIR_STORAGE_FILE_RAW,
- (&raw), EXP_PASS,
- (&raw), ALLOW_PROBE | EXP_PASS,
+ TEST_CHAIN(1, absraw, VIR_STORAGE_FILE_RAW,
(&raw), EXP_PASS,
(&raw), ALLOW_PROBE | EXP_PASS);
- TEST_CHAIN(2, "raw", absraw, VIR_STORAGE_FILE_AUTO,
- (&raw), EXP_PASS,
- (&raw), ALLOW_PROBE | EXP_PASS,
+ TEST_CHAIN(2, absraw, VIR_STORAGE_FILE_AUTO,
(&raw), EXP_PASS,
(&raw), ALLOW_PROBE | EXP_PASS);
@@ -794,14 +785,10 @@ mymain(void)
.type = VIR_STORAGE_TYPE_FILE,
.format = VIR_STORAGE_FILE_RAW,
};
- TEST_CHAIN(3, "qcow2", absqcow2, VIR_STORAGE_FILE_QCOW2,
- (&qcow2, &raw), EXP_PASS,
- (&qcow2, &raw), ALLOW_PROBE | EXP_PASS,
+ TEST_CHAIN(3, absqcow2, VIR_STORAGE_FILE_QCOW2,
(&qcow2, &raw), EXP_PASS,
(&qcow2, &raw), ALLOW_PROBE | EXP_PASS);
- TEST_CHAIN(4, "qcow2", absqcow2, VIR_STORAGE_FILE_AUTO,
- (&qcow2_as_raw), EXP_PASS,
- (&qcow2, &raw), ALLOW_PROBE | EXP_PASS,
+ TEST_CHAIN(4, absqcow2, VIR_STORAGE_FILE_AUTO,
(&qcow2_as_raw), EXP_PASS,
(&qcow2, &raw), ALLOW_PROBE | EXP_PASS);
@@ -816,14 +803,10 @@ mymain(void)
raw.relDirRel = datadir;
/* Qcow2 file with raw as absolute backing, backing format provided */
- TEST_CHAIN(5, "qcow2", absqcow2, VIR_STORAGE_FILE_QCOW2,
- (&qcow2, &raw), EXP_PASS,
- (&qcow2, &raw), ALLOW_PROBE | EXP_PASS,
+ TEST_CHAIN(5, absqcow2, VIR_STORAGE_FILE_QCOW2,
(&qcow2, &raw), EXP_PASS,
(&qcow2, &raw), ALLOW_PROBE | EXP_PASS);
- TEST_CHAIN(6, "qcow2", absqcow2, VIR_STORAGE_FILE_AUTO,
- (&qcow2_as_raw), EXP_PASS,
- (&qcow2, &raw), ALLOW_PROBE | EXP_PASS,
+ TEST_CHAIN(6, absqcow2, VIR_STORAGE_FILE_AUTO,
(&qcow2_as_raw), EXP_PASS,
(&qcow2, &raw), ALLOW_PROBE | EXP_PASS);
@@ -838,9 +821,7 @@ mymain(void)
.format = VIR_STORAGE_FILE_QCOW2,
};
qcow2.relDirRel = datadir;
- TEST_CHAIN(7, "wrap", abswrap, VIR_STORAGE_FILE_QCOW2,
- (&wrap, &qcow2, &raw), EXP_PASS,
- (&wrap, &qcow2, &raw), ALLOW_PROBE | EXP_PASS,
+ TEST_CHAIN(7, abswrap, VIR_STORAGE_FILE_QCOW2,
(&wrap, &qcow2, &raw), EXP_PASS,
(&wrap, &qcow2, &raw), ALLOW_PROBE | EXP_PASS);
@@ -868,9 +849,7 @@ mymain(void)
.type = VIR_STORAGE_TYPE_FILE,
.format = VIR_STORAGE_FILE_QCOW2,
};
- TEST_CHAIN(8, "wrap", abswrap, VIR_STORAGE_FILE_QCOW2,
- (&wrap_as_raw, &qcow2_as_raw), EXP_PASS,
- (&wrap, &qcow2, &raw), ALLOW_PROBE | EXP_PASS,
+ TEST_CHAIN(8, abswrap, VIR_STORAGE_FILE_QCOW2,
(&wrap_as_raw, &qcow2_as_raw), EXP_PASS,
(&wrap, &qcow2, &raw), ALLOW_PROBE | EXP_PASS);
@@ -885,9 +864,7 @@ mymain(void)
qcow2.relDirRel = ".";
/* Qcow2 file with missing backing file but specified type */
- TEST_CHAIN(9, "qcow2", absqcow2, VIR_STORAGE_FILE_QCOW2,
- (&qcow2), EXP_WARN,
- (&qcow2), ALLOW_PROBE | EXP_WARN,
+ TEST_CHAIN(9, absqcow2, VIR_STORAGE_FILE_QCOW2,
(&qcow2), EXP_WARN,
(&qcow2), ALLOW_PROBE | EXP_WARN);
@@ -899,9 +876,7 @@ mymain(void)
ret = -1;
/* Qcow2 file with missing backing file and no specified type */
- TEST_CHAIN(10, "qcow2", absqcow2, VIR_STORAGE_FILE_QCOW2,
- (&qcow2), EXP_WARN,
- (&qcow2), ALLOW_PROBE | EXP_WARN,
+ TEST_CHAIN(10, absqcow2, VIR_STORAGE_FILE_QCOW2,
(&qcow2), EXP_WARN,
(&qcow2), ALLOW_PROBE | EXP_WARN);
@@ -922,9 +897,7 @@ mymain(void)
.relDirRel = ".",
.relDirAbs = ".",
};
- TEST_CHAIN(11, "qcow2", absqcow2, VIR_STORAGE_FILE_QCOW2,
- (&qcow2, &nbd), EXP_PASS,
- (&qcow2, &nbd), ALLOW_PROBE | EXP_PASS,
+ TEST_CHAIN(11, absqcow2, VIR_STORAGE_FILE_QCOW2,
(&qcow2, &nbd), EXP_PASS,
(&qcow2, &nbd), ALLOW_PROBE | EXP_PASS);
@@ -945,9 +918,7 @@ mymain(void)
.type = VIR_STORAGE_TYPE_FILE,
.format = VIR_STORAGE_FILE_RAW,
};
- TEST_CHAIN(12, "qed", absqed, VIR_STORAGE_FILE_AUTO,
- (&qed_as_raw), EXP_PASS,
- (&qed, &raw), ALLOW_PROBE | EXP_PASS,
+ TEST_CHAIN(12, absqed, VIR_STORAGE_FILE_AUTO,
(&qed_as_raw), EXP_PASS,
(&qed, &raw), ALLOW_PROBE | EXP_PASS);
@@ -959,14 +930,10 @@ mymain(void)
.type = VIR_STORAGE_TYPE_DIR,
.format = VIR_STORAGE_FILE_DIR,
};
- TEST_CHAIN(13, "dir", absdir, VIR_STORAGE_FILE_AUTO,
- (&dir), EXP_PASS,
- (&dir), ALLOW_PROBE | EXP_PASS,
+ TEST_CHAIN(13, absdir, VIR_STORAGE_FILE_AUTO,
(&dir), EXP_PASS,
(&dir), ALLOW_PROBE | EXP_PASS);
- TEST_CHAIN(14, "dir", absdir, VIR_STORAGE_FILE_DIR,
- (&dir), EXP_PASS,
- (&dir), ALLOW_PROBE | EXP_PASS,
+ TEST_CHAIN(14, absdir, VIR_STORAGE_FILE_DIR,
(&dir), EXP_PASS,
(&dir), ALLOW_PROBE | EXP_PASS);
@@ -1009,9 +976,7 @@ mymain(void)
raw.pathRel = "../raw";
raw.relDirRel = "sub/../sub/..";
raw.relDirAbs = datadir "/sub/../sub/..";
- TEST_CHAIN(15, "sub/link2", abslink2, VIR_STORAGE_FILE_QCOW2,
- (&link2, &link1, &raw), EXP_PASS,
- (&link2, &link1, &raw), ALLOW_PROBE | EXP_PASS,
+ TEST_CHAIN(15, abslink2, VIR_STORAGE_FILE_QCOW2,
(&link2, &link1, &raw), EXP_PASS,
(&link2, &link1, &raw), ALLOW_PROBE | EXP_PASS);
#endif
@@ -1025,9 +990,7 @@ mymain(void)
qcow2.expBackingStoreRaw = "qcow2";
/* Behavior of an infinite loop chain */
- TEST_CHAIN(16, "qcow2", absqcow2, VIR_STORAGE_FILE_QCOW2,
- (&qcow2), EXP_WARN,
- (&qcow2), ALLOW_PROBE | EXP_WARN,
+ TEST_CHAIN(16, absqcow2, VIR_STORAGE_FILE_QCOW2,
(&qcow2), EXP_WARN,
(&qcow2), ALLOW_PROBE | EXP_WARN);
@@ -1047,9 +1010,7 @@ mymain(void)
qcow2.relDirRel = datadir;
/* Behavior of an infinite loop chain */
- TEST_CHAIN(17, "wrap", abswrap, VIR_STORAGE_FILE_QCOW2,
- (&wrap, &qcow2), EXP_WARN,
- (&wrap, &qcow2), ALLOW_PROBE | EXP_WARN,
+ TEST_CHAIN(17, abswrap, VIR_STORAGE_FILE_QCOW2,
(&wrap, &qcow2), EXP_WARN,
(&wrap, &qcow2), ALLOW_PROBE | EXP_WARN);
--
1.9.3