]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemublocktest: Drop 'network-sheepdog-qcow2' image creation test case
authorPeter Krempa <pkrempa@redhat.com>
Mon, 17 May 2021 08:33:34 +0000 (10:33 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 19 May 2021 08:19:47 +0000 (10:19 +0200)
QEMU dropped sheepdog support for the 6.1 release. Since we use schema
validation in the image creation it would create test failures.

In this instance we just drop the test altogether as adding versioned
capabilities would be a bit too overkill for this scenario.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
tests/qemublocktest.c
tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.json [deleted file]
tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.xml [deleted file]

index 3f3e6d153288d7b33e2bae025aaf999be1ab6d63..0513e5bfc01d7e887ef1cf5ace00bf00239e3b2d 100644 (file)
@@ -1223,7 +1223,6 @@ mymain(void)
     TEST_IMAGE_CREATE("network-gluster-qcow2", NULL);
     TEST_IMAGE_CREATE("network-rbd-qcow2", NULL);
     TEST_IMAGE_CREATE("network-ssh-qcow2", NULL);
-    TEST_IMAGE_CREATE("network-sheepdog-qcow2", NULL);
 
 #define TEST_BITMAP_DETECT(testname) \
     do { \
diff --git a/tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.json b/tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.json
deleted file mode 100644 (file)
index d86bef6..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-protocol:
-{
-  "driver": "sheepdog",
-  "location": {
-    "server": {
-      "type": "inet",
-      "host": "example.com",
-      "port": "1234"
-    },
-    "vdi": "asdf/i.qcow2"
-  },
-  "size": 4294967296
-}
-
-format:
-{
-  "driver": "qcow2",
-  "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 8589934590
-}
diff --git a/tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.xml b/tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.xml
deleted file mode 100644 (file)
index 1145daa..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<disk device='disk' name='vda' type='network'>
-  <driver type='qcow2'/>
-  <source protocol='sheepdog' name='asdf/i.qcow2'>
-    <host name='example.com' port='1234'/>
-    <privateData>
-      <nodenames>
-        <nodename type='storage' name='0123456789ABCDEF0123456789ABCDE'/>
-        <nodename type='format' name='0123456789ABCDEF0123456789ABCDE'/>
-      </nodenames>
-    </privateData>
-  </source>
-</disk>