[PATCH 23/35] virshtest: Adapt 'virsh-int-overflow'
It's a simple test case invoking one virsh command thus it can be moved
to 'virshtest'
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/meson.build | 1 -
tests/virsh-int-overflow | 18 ------------------
tests/virshtest.c | 2 ++
tests/virshtestdata/domain-id-overflow.out | 3 +++
4 files changed, 5 insertions(+), 19 deletions(-)
delete mode 100755 tests/virsh-int-overflow
create mode 100644 tests/virshtestdata/domain-id-overflow.out
diff --git a/tests/meson.build b/tests/meson.build
index 687611a50e..cd473d4ad6 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -692,7 +692,6 @@ if conf.has('WITH_LIBVIRTD')
'libvirtd-pool',
'virsh-auth',
'virsh-checkpoint',
- 'virsh-int-overflow',
'virsh-read-bufsiz',
'virsh-read-non-seekable',
'virsh-schedinfo',
diff --git a/tests/virsh-int-overflow b/tests/virsh-int-overflow
deleted file mode 100755
index e9eb03bfbb..0000000000
--- a/tests/virsh-int-overflow
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# Ensure that an invalid domain ID isn't interpreted as a valid one.
-# Before, an ID of 2^32+2 would be treated just like an ID of 2.
-
-. "$(dirname $0)/test-lib.sh"
-
-if test "$VERBOSE" = yes; then
- set -x
- $abs_top_builddir/tools/virsh --version
-fi
-
-echo "error: failed to get domain '4294967298'" > exp || fail=1
-$abs_top_builddir/tools/virsh --quiet \
- --connect test://$abs_top_srcdir/examples/xml/test/testnode.xml \
- 'domname 4294967298; quit' > /dev/null 2> err || fail=1
-diff -u err exp || fail=1
-
-exit $fail
diff --git a/tests/virshtest.c b/tests/virshtest.c
index dd45cea405..a09ab8c78b 100644
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -215,6 +215,8 @@ mymain(void)
DO_TEST_SCRIPT("attach-disk", NULL, VIRSH_DEFAULT);
DO_TEST_SCRIPT("vcpupin", NULL, VIRSH_DEFAULT);
+ DO_TEST_FULL("domain-id-overflow", NULL, VIRSH_CUSTOM, "-q",
"domname", "4294967298");
+
VIR_FREE(custom_uri);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
diff --git a/tests/virshtestdata/domain-id-overflow.out
b/tests/virshtestdata/domain-id-overflow.out
new file mode 100644
index 0000000000..406d8e353c
--- /dev/null
+++ b/tests/virshtestdata/domain-id-overflow.out
@@ -0,0 +1,3 @@
+error: failed to get domain '4294967298'
+
+## Exit code: 1
--
2.44.0