The test case is a fairly simple invocation of pool-create-as which can be done easily from 'virshtest'. Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx> --- tests/libvirtd-pool | 38 -------------------------- tests/meson.build | 1 - tests/virshtest.c | 3 ++ tests/virshtestdata/pool-define-as.out | 12 ++++++++ 4 files changed, 15 insertions(+), 39 deletions(-) delete mode 100755 tests/libvirtd-pool create mode 100644 tests/virshtestdata/pool-define-as.out diff --git a/tests/libvirtd-pool b/tests/libvirtd-pool deleted file mode 100755 index 4be65c68fe..0000000000 --- a/tests/libvirtd-pool +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# Get coverage of virsh pool-define-as XML formatting - -. "$(dirname $0)/test-lib.sh" - -if test "$VERBOSE" = yes; then - set -x - $abs_top_builddir/tools/virsh --version -fi - -fail=0 - -pwd=$(pwd) || fail=1 - -$abs_top_builddir/tools/virsh --connect test:///default \ - pool-define-as --print-xml \ - P dir src-host /src/path /src/dev S /target-path \ - 1>out 2>&1 - -cat <<EOF > pool-list-exp -<pool type='dir'> - <name>P</name> - <source> - <host name='src-host'/> - <dir path='/src/path'/> - <device path='/src/dev'/> - <name>S</name> - </source> - <target> - <path>/target-path</path> - </target> -</pool> - -EOF - -compare pool-list-exp out || fail=1 - -exit $fail diff --git a/tests/meson.build b/tests/meson.build index c760fe68d9..68f7635df9 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -689,7 +689,6 @@ test_scripts = [] if conf.has('WITH_LIBVIRTD') test_scripts += [ 'libvirtd-fail', - 'libvirtd-pool', 'virsh-auth', 'virsh-self-test', 'virsh-uriprecedence', diff --git a/tests/virshtest.c b/tests/virshtest.c index f520ff9fc9..4e11a1cb04 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -304,6 +304,9 @@ mymain(void) DO_TEST_FULL("domain-id-overflow", NULL, VIRSH_CUSTOM, "-q", "domname", "4294967298"); DO_TEST_FULL("schedinfo-invalid-argument", NULL, VIRSH_DEFAULT, "schedinfo", "1", "--set", "j=k"); + DO_TEST_FULL("pool-define-as", NULL, VIRSH_DEFAULT, "-q", + "pool-define-as", "--print-xml", "P", "dir", "src-host", + "/src/path", "/src/dev", "S", "/target-path"); DO_TEST_SCRIPT("snapshot", "<creationTime", VIRSH_DEFAULT); DO_TEST_FULL("snapshot-redefine", NULL, VIRSH_DEFAULT, diff --git a/tests/virshtestdata/pool-define-as.out b/tests/virshtestdata/pool-define-as.out new file mode 100644 index 0000000000..dade8b958c --- /dev/null +++ b/tests/virshtestdata/pool-define-as.out @@ -0,0 +1,12 @@ +<pool type='dir'> + <name>P</name> + <source> + <host name='src-host'/> + <dir path='/src/path'/> + <device path='/src/dev'/> + <name>S</name> + </source> + <target> + <path>/target-path</path> + </target> +</pool> -- 2.44.0 _______________________________________________ Devel mailing list -- devel@xxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx