virshtest: Adapt 'virsh-schedinfo'

It's a simple virsh invocation which can be done in 'virshtest'

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/meson.build b/tests/meson.build
index cd473d4ad688d6d95cfc897cc9fdb73705936c7f..8392778a762fd4b0cfd47556871dc0a320651076 100644 (file)
--- 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 (executable)
index e4e2509..0000000
--- 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 fe9367c3872493a1768b8487e377b7c5c3bb2555..00db25ccb443c078d7e525fc6af81e8d68def40a 100644 (file)
--- 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 (file)
index 0000000..833c6df
--- /dev/null
+++ b/tests/virshtestdata/schedinfo-invalid-argument.out
@@ -0,0 +1,5 @@
+Scheduler      : fair
+error: invalid scheduler option: j
+
+
+## Exit code: 1