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 < pool-list-exp - - P - - - - - S - - - /target-path - - - -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 49e7268595..72c6302a54 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", " + P + + + + + S + + + /target-path + +