[PATCH 2/5] tests: Remove storage pool/vol tests for sheepdog
Peter Krempa
pkrempa at redhat.com
Mon Aug 22 14:48:13 UTC 2022
The support for the sheepdog storage backend will be dropped in the
upcoming patches. Remove all the relevant tests.
Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
tests/meson.build | 6 -
tests/storagebackendsheepdogtest.c | 205 ------------------
tests/storagepoolxml2argvtest.c | 1 -
tests/storagepoolxml2xmlin/pool-sheepdog.xml | 8 -
tests/storagepoolxml2xmlout/pool-sheepdog.xml | 11 -
tests/storagepoolxml2xmltest.c | 1 -
tests/storagevolxml2xmlin/vol-sheepdog.xml | 10 -
tests/storagevolxml2xmlout/vol-sheepdog.xml | 8 -
tests/storagevolxml2xmltest.c | 1 -
9 files changed, 251 deletions(-)
delete mode 100644 tests/storagebackendsheepdogtest.c
delete mode 100644 tests/storagepoolxml2xmlin/pool-sheepdog.xml
delete mode 100644 tests/storagepoolxml2xmlout/pool-sheepdog.xml
delete mode 100644 tests/storagevolxml2xmlin/vol-sheepdog.xml
delete mode 100644 tests/storagevolxml2xmlout/vol-sheepdog.xml
diff --git a/tests/meson.build b/tests/meson.build
index d6b1bb2bf0..2556b71444 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -509,12 +509,6 @@ if conf.has('WITH_STORAGE_FS')
]
endif
-if conf.has('WITH_STORAGE_SHEEPDOG')
- tests += [
- { 'name': 'storagebackendsheepdogtest', 'link_with': [ storage_driver_impl_lib, storage_backend_sheepdog_priv_lib ] },
- ]
-endif
-
if conf.has('WITH_VBOX')
tests += [
{ 'name': 'vboxsnapshotxmltest', 'link_with': [ vbox_driver_impl ] },
diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c
deleted file mode 100644
index 8f27e40d46..0000000000
--- a/tests/storagebackendsheepdogtest.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * storagebackendsheepdogtest.c: storage backend for Sheepdog handling
- *
- * Copyright (C) 2014 Red Hat, Inc.
- * Copyright (C) 2012 Sebastian Wiedenroth
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-
-#include <unistd.h>
-
-#include <fcntl.h>
-
-#include "internal.h"
-#include "testutils.h"
-#define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW
-#include "storage/storage_backend_sheepdog_priv.h"
-
-#define VIR_FROM_THIS VIR_FROM_NONE
-
-typedef struct {
- const char *output;
- int expected_return;
- uint64_t expected_capacity;
- uint64_t expected_allocation;
-} collie_test;
-
-struct testNodeInfoParserData {
- collie_test data;
- const char *poolxml;
-};
-
-struct testVDIListParserData {
- collie_test data;
- const char *poolxml;
- const char *volxml;
-};
-
-
-static int
-test_node_info_parser(const void *opaque)
-{
- const struct testNodeInfoParserData *data = opaque;
- collie_test test = data->data;
- g_autofree char *output = NULL;
- g_autoptr(virStoragePoolDef) pool = NULL;
-
- if (!(pool = virStoragePoolDefParseFile(data->poolxml)))
- return -1;
-
- output = g_strdup(test.output);
-
- if (virStorageBackendSheepdogParseNodeInfo(pool, output) !=
- test.expected_return)
- return -1;
-
- if (test.expected_return)
- return 0;
-
- if (pool->capacity == test.expected_capacity &&
- pool->allocation == test.expected_allocation)
- return 0;
-
- return -1;
-}
-
-static int
-test_vdi_list_parser(const void *opaque)
-{
- const struct testVDIListParserData *data = opaque;
- collie_test test = data->data;
- g_autofree char *output = NULL;
- g_autoptr(virStoragePoolDef) pool = NULL;
- g_autoptr(virStorageVolDef) vol = NULL;
-
- if (!(pool = virStoragePoolDefParseFile(data->poolxml)))
- return -1;
-
- if (!(vol = virStorageVolDefParseFile(pool, data->volxml, 0)))
- return -1;
-
- output = g_strdup(test.output);
-
- if (virStorageBackendSheepdogParseVdiList(vol, output) !=
- test.expected_return)
- return -1;
-
- if (test.expected_return)
- return 0;
-
- if (vol->target.capacity == test.expected_capacity &&
- vol->target.allocation == test.expected_allocation)
- return 0;
-
- return -1;
-}
-
-
-static int
-mymain(void)
-{
- int ret = 0;
- g_autofree char *poolxml = NULL;
- g_autofree char *volxml = NULL;
-
- collie_test node_info_tests[] = {
- {"", -1, 0, 0},
- {"Total 15245667872 117571104 0% 20972341\n", 0, 15245667872, 117571104},
- {"To", -1, 0, 0},
- {"asdf\nasdf", -1, 0, 0},
- {"Total ", -1, 0, 0},
- {"Total 1", -1, 0, 0},
- {"Total 1\n", -1, 0, 0},
- {"Total 1 ", -1, 0, 0},
- {"Total 1 2", -1, 0, 0},
- {"Total 1 2 ", -1, 0, 0},
- {"Total 1 2\n", 0, 1, 2},
- {"Total 1 2 \n", 0, 1, 2},
- {"Total a 2 \n", -1, 0, 0},
- {"Total 1 b \n", -1, 0, 0},
- {"Total a b \n", -1, 0, 0},
- {"stuff\nTotal 1 2 \n", 0, 1, 2},
- {"0 1 2 3\nTotal 1 2 \n", 0, 1, 2},
- {NULL, 0, 0, 0}
- };
-
- collie_test vdi_list_tests[] = {
- {"", -1, 0, 0},
- {"= test 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20},
- {"= test\\ with\\ spaces 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20},
- {"= backslashattheend\\\\ 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20},
- {"s test 1 10 20 0 1336556634 7c2b25\n= test 3 50 60 0 1336557216 7c2b27\n", 0, 50, 60},
- {"=", -1, 0, 0},
- {"= test", -1, 0, 0},
- {"= test ", -1, 0, 0},
- {"= test 1", -1, 0, 0},
- {"= test 1 ", -1, 0, 0},
- {"= test 1 2", -1, 0, 0},
- {"= test 1 2 ", -1, 0, 0},
- {"= test 1 2 3", -1, 0, 0},
- {NULL, 0, 0, 0}
- };
-
- collie_test *test = node_info_tests;
-
- poolxml = g_strdup_printf("%s/storagepoolxml2xmlin/pool-sheepdog.xml",
- abs_srcdir);
-
- volxml = g_strdup_printf("%s/storagevolxml2xmlin/vol-sheepdog.xml",
- abs_srcdir);
-
-#define DO_TEST_NODE(collie) \
- do { \
- struct testNodeInfoParserData data = { \
- .data = collie, \
- .poolxml = poolxml, \
- }; \
- if (virTestRun("node_info_parser", test_node_info_parser, \
- &data) < 0) \
- ret = -1; \
- } while (0)
-
- while (test->output != NULL) {
- DO_TEST_NODE(*test);
- ++test;
- }
-
-
-#define DO_TEST_VDI(collie) \
- do { \
- struct testVDIListParserData data = { \
- .data = collie, \
- .poolxml = poolxml, \
- .volxml = volxml, \
- }; \
- if (virTestRun("vdi_list_parser", test_vdi_list_parser, \
- &data) < 0) \
- ret = -1; \
- } while (0)
-
- test = vdi_list_tests;
-
- while (test->output != NULL) {
- DO_TEST_VDI(*test);
- ++test;
- }
-
- return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-VIR_TEST_MAIN(mymain)
diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtest.c
index 487481b7ee..04ff45f98d 100644
--- a/tests/storagepoolxml2argvtest.c
+++ b/tests/storagepoolxml2argvtest.c
@@ -175,7 +175,6 @@ mymain(void)
DO_TEST_FAIL("pool-mpath");
DO_TEST_FAIL("pool-iscsi-multiiqn");
DO_TEST_FAIL("pool-iscsi-vendor-product");
- DO_TEST_FAIL("pool-sheepdog");
DO_TEST_FAIL("pool-gluster");
DO_TEST_FAIL("pool-gluster-sub");
DO_TEST_FAIL("pool-scsi-type-scsi-host-stable");
diff --git a/tests/storagepoolxml2xmlin/pool-sheepdog.xml b/tests/storagepoolxml2xmlin/pool-sheepdog.xml
deleted file mode 100644
index 49b6baf014..0000000000
--- a/tests/storagepoolxml2xmlin/pool-sheepdog.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<pool type='sheepdog'>
- <source>
- <name>sheepdog</name>
- <host name='localhost' port='7000'/>
- </source>
- <uuid>65fcba04-5b13-bd93-cff3-52ce48e11ad7</uuid>
- <name>sheepdog</name>
-</pool>
diff --git a/tests/storagepoolxml2xmlout/pool-sheepdog.xml b/tests/storagepoolxml2xmlout/pool-sheepdog.xml
deleted file mode 100644
index 000c068677..0000000000
--- a/tests/storagepoolxml2xmlout/pool-sheepdog.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<pool type='sheepdog'>
- <name>sheepdog</name>
- <uuid>65fcba04-5b13-bd93-cff3-52ce48e11ad7</uuid>
- <capacity unit='bytes'>0</capacity>
- <allocation unit='bytes'>0</allocation>
- <available unit='bytes'>0</available>
- <source>
- <host name='localhost' port='7000'/>
- <name>sheepdog</name>
- </source>
-</pool>
diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c
index 2bad858033..76d6f54b33 100644
--- a/tests/storagepoolxml2xmltest.c
+++ b/tests/storagepoolxml2xmltest.c
@@ -86,7 +86,6 @@ mymain(void)
DO_TEST("pool-mpath");
DO_TEST("pool-iscsi-multiiqn");
DO_TEST("pool-iscsi-vendor-product");
- DO_TEST("pool-sheepdog");
DO_TEST("pool-gluster");
DO_TEST("pool-gluster-sub");
DO_TEST("pool-scsi-type-scsi-host-stable");
diff --git a/tests/storagevolxml2xmlin/vol-sheepdog.xml b/tests/storagevolxml2xmlin/vol-sheepdog.xml
deleted file mode 100644
index d6e920bb81..0000000000
--- a/tests/storagevolxml2xmlin/vol-sheepdog.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<volume type='network'>
- <name>test2</name>
- <source>
- </source>
- <capacity unit='bytes'>1024</capacity>
- <allocation unit='bytes'>0</allocation>
- <target>
- <path>sheepdog:test2</path>
- </target>
-</volume>
diff --git a/tests/storagevolxml2xmlout/vol-sheepdog.xml b/tests/storagevolxml2xmlout/vol-sheepdog.xml
deleted file mode 100644
index 47fb8eb418..0000000000
--- a/tests/storagevolxml2xmlout/vol-sheepdog.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<volume type='network'>
- <name>test2</name>
- <capacity unit='bytes'>1024</capacity>
- <allocation unit='bytes'>0</allocation>
- <target>
- <path>sheepdog:test2</path>
- </target>
-</volume>
diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c
index 5d06821cd0..161cb7c6bc 100644
--- a/tests/storagevolxml2xmltest.c
+++ b/tests/storagevolxml2xmltest.c
@@ -92,7 +92,6 @@ mymain(void)
DO_TEST("pool-disk", "vol-partition");
DO_TEST("pool-logical", "vol-logical");
DO_TEST("pool-logical", "vol-logical-backing");
- DO_TEST("pool-sheepdog", "vol-sheepdog");
DO_TEST("pool-gluster", "vol-gluster-dir");
DO_TEST("pool-gluster", "vol-gluster-dir-neg-uid");
DO_TEST_FULL("pool-dir", "vol-qcow2-nocapacity",
--
2.37.1
More information about the libvir-list
mailing list