79 lines
2.8 KiB
Diff
79 lines
2.8 KiB
Diff
From 979d1ba3ae1332bda80cb6eca98e41dc4462a226 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
Date: Tue, 31 Aug 2021 11:41:55 +0200
|
|
Subject: [PATCH] tests: virstoragetest: remove tests without backing type
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
As of qemu commit:
|
|
|
|
commit 497a30dbb065937d67f6c43af6dd78492e1d6f6d
|
|
qemu-img: Require -F with -b backing image
|
|
|
|
creating images with backing images requires specifying the format.
|
|
|
|
Remove tests which do not pass the backing format on the command
|
|
line.
|
|
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
---
|
|
tests/virstoragetest.c | 33 ---------------------------------
|
|
1 file changed, 33 deletions(-)
|
|
|
|
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
|
|
index 1b211b60e6..b80818bc7b 100644
|
|
--- a/tests/virstoragetest.c
|
|
+++ b/tests/virstoragetest.c
|
|
@@ -638,30 +638,6 @@ mymain(void)
|
|
};
|
|
TEST_CHAIN(abswrap, VIR_STORAGE_FILE_QCOW2, (&wrap, &qcow2, &raw), EXP_PASS);
|
|
|
|
- /* Rewrite qcow2 and wrap file to omit backing file type */
|
|
- virCommandFree(cmd);
|
|
- cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
|
|
- "-b", absraw, "qcow2", NULL);
|
|
- if (virCommandRun(cmd, NULL) < 0)
|
|
- ret = -1;
|
|
-
|
|
- virCommandFree(cmd);
|
|
- cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
|
|
- "-b", absqcow2, "wrap", NULL);
|
|
- if (virCommandRun(cmd, NULL) < 0)
|
|
- ret = -1;
|
|
-
|
|
- /* Qcow2 file with raw as absolute backing, backing format omitted */
|
|
- testFileData wrap_as_raw = {
|
|
- .expBackingStoreRaw = absqcow2,
|
|
- .expCapacity = 1024,
|
|
- .path = abswrap,
|
|
- .type = VIR_STORAGE_TYPE_FILE,
|
|
- .format = VIR_STORAGE_FILE_QCOW2,
|
|
- };
|
|
- TEST_CHAIN(abswrap, VIR_STORAGE_FILE_QCOW2,
|
|
- (&wrap_as_raw, &qcow2_as_raw), EXP_FAIL);
|
|
-
|
|
/* Rewrite qcow2 to a missing backing file, with backing type */
|
|
virCommandFree(cmd);
|
|
cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
|
|
@@ -674,15 +650,6 @@ mymain(void)
|
|
/* Qcow2 file with missing backing file but specified type */
|
|
TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_FAIL);
|
|
|
|
- /* Rewrite qcow2 to a missing backing file, without backing type */
|
|
- virCommandFree(cmd);
|
|
- cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
|
|
- "-b", datadir "/bogus", "qcow2", NULL);
|
|
- if (virCommandRun(cmd, NULL) < 0)
|
|
- ret = -1;
|
|
-
|
|
- /* Qcow2 file with missing backing file and no specified type */
|
|
- TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_FAIL);
|
|
|
|
/* Rewrite qcow2 to use an nbd: protocol as backend */
|
|
virCommandFree(cmd);
|
|
--
|
|
2.31.1
|
|
|