[PATCH 24/35] virshtest: Adapt 'virsh-schedinfo'

It's a simple virsh invocation which can be done in 'virshtest' Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/meson.build | 1 - tests/virsh-schedinfo | 40 ------------------- tests/virshtest.c | 2 +- .../schedinfo-invalid-argument.out | 5 +++ 4 files changed, 6 insertions(+), 42 deletions(-) delete mode 100755 tests/virsh-schedinfo create mode 100644 tests/virshtestdata/schedinfo-invalid-argument.out diff --git a/tests/meson.build b/tests/meson.build index cd473d4ad6..8392778a76 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -694,7 +694,6 @@ if conf.has('WITH_LIBVIRTD') 'virsh-checkpoint', 'virsh-read-bufsiz', 'virsh-read-non-seekable', - 'virsh-schedinfo', 'virsh-self-test', 'virsh-snapshot', 'virsh-start', diff --git a/tests/virsh-schedinfo b/tests/virsh-schedinfo deleted file mode 100755 index e4e2509f76..0000000000 --- a/tests/virsh-schedinfo +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# Ensure that virsh schedinfo --set invalid=val fails - -# Copyright (C) 2010-2011, 2013 Red Hat, Inc. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. - -# This program 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 General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>;. - -. "$(dirname $0)/test-lib.sh" - -VIRSH=$abs_top_builddir/tools/virsh - -if test "$VERBOSE" = yes; then - set -x - $VIRSH --version -fi - -printf 'Scheduler : fair\n\n' > exp-out || framework_failure -printf 'error: invalid scheduler option: j\n' > exp-err || framework_failure - -fail=0 - -test_url=test:///default - -$VIRSH -c $test_url schedinfo 1 --set j=k >out 2>err && fail=1 -compare exp-out out || fail=1 -compare exp-err err || fail=1 - -(exit $fail); exit $fail diff --git a/tests/virshtest.c b/tests/virshtest.c index a09ab8c78b..f4c41fca46 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -203,7 +203,6 @@ mymain(void) /* test of splitting in vshStringToArray */ DO_TEST_SCRIPT("echo-split", NULL, VIRSH_DEFAULT, "-q"); -# undef DO_TEST /* comprehensive coverage of argument assignment */ DO_TEST_SCRIPT("argument-assignment", NULL, VIRSH_DEFAULT, "-k0", "-d0"); @@ -216,6 +215,7 @@ mymain(void) DO_TEST_SCRIPT("vcpupin", NULL, VIRSH_DEFAULT); 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"); VIR_FREE(custom_uri); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/virshtestdata/schedinfo-invalid-argument.out b/tests/virshtestdata/schedinfo-invalid-argument.out new file mode 100644 index 0000000000..833c6dfd6a --- /dev/null +++ b/tests/virshtestdata/schedinfo-invalid-argument.out @@ -0,0 +1,5 @@ +Scheduler : fair +error: invalid scheduler option: j + + +## Exit code: 1 -- 2.44.0