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@xxxxxxxxxx> --- tests/qemublocktest.c | 1 - .../imagecreate/network-sheepdog-qcow2.json | 20 ------------------- .../imagecreate/network-sheepdog-qcow2.xml | 12 ----------- 3 files changed, 33 deletions(-) delete mode 100644 tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.json delete mode 100644 tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.xml diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 3f3e6d1532..0513e5bfc0 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -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 index d86bef6bc8..0000000000 --- a/tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.json +++ /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 index 1145daafdd..0000000000 --- a/tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.xml +++ /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> -- 2.30.2