External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

virshtest: Adapt 'virsh-schedinfo'

Browse Source 
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>
This commit is contained in:
Peter Krempa 2024-03-21 10:51:02 +01:00
parent 090ae2b46c
commit 6bc71ed27c
4 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/meson.build
View File

@ -694,7 +694,6 @@ if conf.has('WITH_LIBVIRTD')
'virsh-checkpoint', 'virsh-checkpoint',
'virsh-read-bufsiz', 'virsh-read-bufsiz',
'virsh-read-non-seekable', 'virsh-read-non-seekable',
'virsh-schedinfo',
'virsh-self-test', 'virsh-self-test',
'virsh-snapshot', 'virsh-snapshot',
'virsh-start', 'virsh-start',

40
tests/virsh-schedinfo
View File

@ -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

2
tests/virshtest.c
View File

@ -203,7 +203,6 @@ mymain(void)
/* test of splitting in vshStringToArray */ /* test of splitting in vshStringToArray */
DO_TEST_SCRIPT("echo-split", NULL, VIRSH_DEFAULT, "-q"); DO_TEST_SCRIPT("echo-split", NULL, VIRSH_DEFAULT, "-q");
# undef DO_TEST
/* comprehensive coverage of argument assignment */ /* comprehensive coverage of argument assignment */
DO_TEST_SCRIPT("argument-assignment", NULL, VIRSH_DEFAULT, "-k0", "-d0"); 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_SCRIPT("vcpupin", NULL, VIRSH_DEFAULT);
DO_TEST_FULL("domain-id-overflow", NULL, VIRSH_CUSTOM, "-q", "domname", "4294967298"); 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); VIR_FREE(custom_uri);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;

5
tests/virshtestdata/schedinfo-invalid-argument.out Normal file
View File

@ -0,0 +1,5 @@
Scheduler : fair
error: invalid scheduler option: j
## Exit code: 1