From nobody Tue Feb 10 03:16:18 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 17111939235450.21492069456701302; Sat, 23 Mar 2024 04:38:43 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 50EED1F1C; Sat, 23 Mar 2024 07:38:42 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D09121AEC; Sat, 23 Mar 2024 07:33:21 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8DF771AB2; Sat, 23 Mar 2024 07:33:10 -0400 (EDT) Received: from mx1.osci.io (polly.osci.io [8.43.85.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id CDA221AD1 for ; Sat, 23 Mar 2024 07:32:51 -0400 (EDT) Received: by mx1.osci.io (Postfix, from userid 994) id 4F6E7223E5; Fri, 22 Mar 2024 13:56:44 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by mx1.osci.io (Postfix) with ESMTPS id E6C89223E1 for ; Fri, 22 Mar 2024 13:56:42 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-590-lDJFSYfvP1-tcIaETXYKkA-1; Fri, 22 Mar 2024 13:56:40 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8CDC980F7E5 for ; Fri, 22 Mar 2024 17:56:40 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 06621492BD0 for ; Fri, 22 Mar 2024 17:56:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: lDJFSYfvP1-tcIaETXYKkA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 22/35] virshtest: Adapt 'virsh-vcpupin' test Date: Fri, 22 Mar 2024 18:56:00 +0100 Message-ID: <028ce721a9d39820ac9aa893c626afc636b7cfc3.1711129973.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: L4RLZJYJ3VRAEGWBNARLSIE5VSELOWVQ X-Message-ID-Hash: L4RLZJYJ3VRAEGWBNARLSIE5VSELOWVQ X-MailFrom: SRS0=Xa5W=K4=redhat.com=pkrempa@osci.io X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1711193924566100001 As all cases are negative we can test them all in one virsh run. Signed-off-by: Peter Krempa --- tests/meson.build | 1 - tests/virsh-vcpupin | 100 -------------------------------- tests/virshtest.c | 1 + tests/virshtestdata/vcpupin.in | 23 ++++++++ tests/virshtestdata/vcpupin.out | 26 +++++++++ 5 files changed, 50 insertions(+), 101 deletions(-) delete mode 100755 tests/virsh-vcpupin create mode 100755 tests/virshtestdata/vcpupin.in create mode 100644 tests/virshtestdata/vcpupin.out diff --git a/tests/meson.build b/tests/meson.build index 35e8bd53bb..687611a50e 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -701,7 +701,6 @@ if conf.has('WITH_LIBVIRTD') 'virsh-start', 'virsh-undefine', 'virsh-uriprecedence', - 'virsh-vcpupin', 'virt-admin-self-test', ] diff --git a/tests/virsh-vcpupin b/tests/virsh-vcpupin deleted file mode 100755 index 306552a8f4..0000000000 --- a/tests/virsh-vcpupin +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh -# ensure that an invalid CPU spec elicits a diagnostic - -# Copyright (C) 2008 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 -# . - -. "$(dirname $0)/test-lib.sh" - -if test "$VERBOSE" =3D yes; then - set -x - $abs_top_builddir/tools/virsh --version -fi - -fail=3D0 - -# Invalid syntax. -$abs_top_builddir/tools/virsh --connect test:///default vcpupin test a 0,1= > out 2>&1 -test $? =3D 1 || fail=3D1 -cat <<\EOF > exp || fail=3D1 -error: Numeric value 'a' for option is malformed or out of range - -EOF -compare exp out || fail=3D1 - -# An out-of-range vCPU number deserves a diagnostic, too. -$abs_top_builddir/tools/virsh --connect test:///default vcpupin test 100 0= ,1 > out 2>&1 -test $? =3D 1 || fail=3D1 -cat <<\EOF > exp || fail=3D1 -error: invalid argument: requested vcpu '100' is not present in the domain - -EOF -compare exp out || fail=3D1 - -# Negative number -$abs_top_builddir/tools/virsh --connect test:///default vcpupin test -100 = 0,1 > out 2>&1 -test $? =3D 1 || fail=3D1 -cat <<\EOF > exp || fail=3D1 -error: Numeric value '-100' for option is malformed or out of range - -EOF -compare exp out || fail=3D1 - -# missing argument -$abs_top_builddir/tools/virsh --connect test:///default vcpupin test --cpu= list 0,1 > out 2>&1 -test $? =3D 1 || fail=3D1 -cat <<\EOF > exp || fail=3D1 -error: vcpupin: Missing vCPU number in pin mode. - -EOF -compare exp out || fail=3D1 - -# An out-of-range vCPU number when get information with live flag -$abs_top_builddir/tools/virsh --connect test:///default vcpupin test 100 -= -live > out 2>&1 -test $? =3D 1 || fail=3D1 -cat <<\EOF > exp || fail=3D1 -error: vcpu 100 is out of range of live cpu count 2 - -EOF -compare exp out || fail=3D1 - -# An out-of-range vCPU number when get information without flag -$abs_top_builddir/tools/virsh --connect test:///default vcpupin test 100 >= out 2>&1 -test $? =3D 1 || fail=3D1 -cat <<\EOF > exp || fail=3D1 -error: vcpu 100 is out of range of live cpu count 2 - -EOF -compare exp out || fail=3D1 - -# An out-of-range vCPU number when get information with config flag -$abs_top_builddir/tools/virsh --connect test:///default vcpupin test 100 -= -config > out 2>&1 -test $? =3D 1 || fail=3D1 -cat <<\EOF > exp || fail=3D1 -error: vcpu 100 is out of range of persistent cpu count 2 - -EOF -compare exp out || fail=3D1 - -# An out-of-range vCPU number when get information with current flag -$abs_top_builddir/tools/virsh --connect test:///default vcpupin test 100 -= -current > out 2>&1 -test $? =3D 1 || fail=3D1 -cat <<\EOF > exp || fail=3D1 -error: vcpu 100 is out of range of live cpu count 2 - -EOF -compare exp out || fail=3D1 -(exit $fail); exit $fail diff --git a/tests/virshtest.c b/tests/virshtest.c index 78f6148733..dd45cea405 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -213,6 +213,7 @@ mymain(void) * thus is marked expensive */ DO_TEST_SCRIPT_FULL("numeric-parsing-event", true, NULL, VIRSH_DEFAULT= , "-q"); DO_TEST_SCRIPT("attach-disk", NULL, VIRSH_DEFAULT); + DO_TEST_SCRIPT("vcpupin", NULL, VIRSH_DEFAULT); VIR_FREE(custom_uri); return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/virshtestdata/vcpupin.in b/tests/virshtestdata/vcpupin.in new file mode 100755 index 0000000000..42e0e7f529 --- /dev/null +++ b/tests/virshtestdata/vcpupin.in @@ -0,0 +1,23 @@ +echo Invalid syntax. +vcpupin test a 0,1 + +echo An out-of-range vCPU number deserves a diagnostic, too. +vcpupin test 100 0,1 + +echo Negative number +vcpupin test -100 0,1 + +echo missing argument +vcpupin test --cpulist 0,1 + +echo An out-of-range vCPU number when get information with live flag +vcpupin test 100 --live + +echo An out-of-range vCPU number when get information without flag +vcpupin test 100 + +echo An out-of-range vCPU number when get information with config flag +vcpupin test 100 --config + +echo An out-of-range vCPU number when get information with current flag +vcpupin test 100 --current diff --git a/tests/virshtestdata/vcpupin.out b/tests/virshtestdata/vcpupin.= out new file mode 100644 index 0000000000..92fc14a697 --- /dev/null +++ b/tests/virshtestdata/vcpupin.out @@ -0,0 +1,26 @@ +Invalid syntax. +error: Numeric value 'a' for option is malformed or out of range + +An out-of-range vCPU number deserves a diagnostic, too. +error: invalid argument: requested vcpu '100' is not present in the domain + +Negative number +error: Numeric value '-100' for option is malformed or out of range + +missing argument +error: vcpupin: Missing vCPU number in pin mode. + +An out-of-range vCPU number when get information with live flag +error: vcpu 100 is out of range of live cpu count 2 + +An out-of-range vCPU number when get information without flag +error: vcpu 100 is out of range of live cpu count 2 + +An out-of-range vCPU number when get information with config flag +error: vcpu 100 is out of range of persistent cpu count 2 + +An out-of-range vCPU number when get information with current flag +error: vcpu 100 is out of range of live cpu count 2 + + +## Exit code: 1 --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org