From nobody Mon Feb 9 12:42:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1692949254; cv=none; d=zohomail.com; s=zohoarc; b=YjKfwnPrZlRdsnI4ASGfxKAXjqZDXruYqFaMAw0IR9K8qRRSJSQvVHaf0q7EXPo5mDhH1ANAlyw/DqFmE2KNNOQxyTuXjE4xgutkykj4O8mmHvU2QQOVxGhlrllufmoHCMUMhD01KAQwYMXe1YWtn+e7Qo8ErENrFV+jhQIQgzA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692949254; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6vSiGjp2wc5de7Lhbo7S4+KxILWJwZP8CczbLt6D0ng=; b=BCrZnFP8s27h7iBEWRxlpr72x2Vu27OJXwxxdPCblBiWLiVLVz1NLK3qRoy9Ogz/Bq3chSIsghhaF6n187F3RM2M4SNnt2dphszyKApjXsYFrDzvhphOMMM41PFh0wnxj3yHKdUDK/sJvpRr1brnZfV1Dzy9LKiF0g8Uge4+sww= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1692949254787686.2795790847753; Fri, 25 Aug 2023 00:40:54 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-117-T5pnPIi4NamRgDSbU6G95w-1; Fri, 25 Aug 2023 03:40:49 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0BFEF1C09A62; Fri, 25 Aug 2023 07:40:41 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC5F86B59C; Fri, 25 Aug 2023 07:40:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CE33C19465B7; Fri, 25 Aug 2023 07:40:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8D74319465B1 for ; Fri, 25 Aug 2023 07:40:38 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8146F2026D68; Fri, 25 Aug 2023 07:40:38 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28F622026D76 for ; Fri, 25 Aug 2023 07:40:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692949253; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=6vSiGjp2wc5de7Lhbo7S4+KxILWJwZP8CczbLt6D0ng=; b=DrFVRBGHOMALlItfmjeLxdqdx+YYe1DqRI2I1iAzUSylr/NROcoUbeLKt27dQv4661eGAb a4UqmXJCHhVIdNOij97avS3K5ELu1Syk3KyIXO5F+1qH+V7jkG+kwjy4sabXhzbO8fuJOC 6XCfVj1hQ1hUfudhfMQYr2wSMpfoTeg= X-MC-Unique: T5pnPIi4NamRgDSbU6G95w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 20/27] test: Move error messages onto a single line Date: Fri, 25 Aug 2023 09:40:17 +0200 Message-ID: <5a598dba79c8e32a2ef1522a0c034001c4e7ae29.1692949012.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692949255177100010 Content-Type: text/plain; charset="utf-8"; x-default="true" Error messages are exempt from the 80 columns rule. Move them onto one line. Signed-off-by: Michal Privoznik --- src/test/test_driver.c | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 905be3853b..5908489a50 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2691,8 +2691,7 @@ static int testDomainSetMemoryStatsPeriod(virDomainPt= r dom, =20 if (!virDomainDefHasMemballoon(def)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("No memory balloon device configured, " - "can not set the collection period")); + _("No memory balloon device configured, can not set= the collection period")); goto cleanup; } =20 @@ -2727,22 +2726,19 @@ static int testDomainSetMemoryFlags(virDomainPtr do= main, if (flags & VIR_DOMAIN_MEM_MAXIMUM) { if (live) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot resize the maximum memory on an " - "active domain")); + _("cannot resize the maximum memory on an activ= e domain")); goto cleanup; } =20 if (virDomainNumaGetNodeCount(def->numa) > 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("initial memory size of a domain with NUMA " - "nodes cannot be modified with this API")); + _("initial memory size of a domain with NUMA no= des cannot be modified with this API")); goto cleanup; } =20 if (def->mem.max_memory && def->mem.max_memory < memory) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot set initial memory size greater than " - "the maximum memory size")); + _("cannot set initial memory size greater than = the maximum memory size")); goto cleanup; } =20 @@ -3413,8 +3409,7 @@ testDomainSetMemoryParameters(virDomainPtr dom, =20 if (mem_limit > swap_limit) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("memory hard_limit tunable value must be lowe= r " - "than or equal to swap_hard_limit")); + _("memory hard_limit tunable value must be lowe= r than or equal to swap_hard_limit")); goto cleanup; } } @@ -3945,32 +3940,28 @@ testDomainSetBlockIoTune(virDomainPtr dom, if ((info.total_bytes_sec && info.read_bytes_sec) || (info.total_bytes_sec && info.write_bytes_sec)) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("total and read/write of bytes_sec " - "cannot be set at the same time")); + _("total and read/write of bytes_sec cannot be set = at the same time")); goto cleanup; } =20 if ((info.total_iops_sec && info.read_iops_sec) || (info.total_iops_sec && info.write_iops_sec)) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("total and read/write of iops_sec " - "cannot be set at the same time")); + _("total and read/write of iops_sec cannot be set a= t the same time")); goto cleanup; } =20 if ((info.total_bytes_sec_max && info.read_bytes_sec_max) || (info.total_bytes_sec_max && info.write_bytes_sec_max)) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("total and read/write of bytes_sec_max " - "cannot be set at the same time")); + _("total and read/write of bytes_sec_max cannot be = set at the same time")); goto cleanup; } =20 if ((info.total_iops_sec_max && info.read_iops_sec_max) || (info.total_iops_sec_max && info.write_iops_sec_max)) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("total and read/write of iops_sec_max " - "cannot be set at the same time")); + _("total and read/write of iops_sec_max cannot be s= et at the same time")); goto cleanup; } =20 @@ -4578,8 +4569,7 @@ static int testDomainUndefineFlags(virDomainPtr domai= n, if (privdom->hasManagedSave && !(flags & VIR_DOMAIN_UNDEFINE_MANAGED_SAVE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("Refusing to undefine while domain managed " - "save image exists")); + _("Refusing to undefine while domain managed save i= mage exists")); goto cleanup; } =20 @@ -6053,8 +6043,7 @@ testInterfaceChangeCommit(virConnectPtr conn, =20 if (!privconn->transaction_running) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("no transaction running, " - "nothing to be committed.")); + _("no transaction running, nothing to be committed.= ")); goto cleanup; } =20 @@ -6083,8 +6072,7 @@ testInterfaceChangeRollback(virConnectPtr conn, =20 if (!privconn->transaction_running) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("no transaction running, " - "nothing to rollback.")); + _("no transaction running, nothing to rollback.")); goto cleanup; } =20 @@ -9015,8 +9003,7 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snaps= hot, (flags & (VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) =3D=3D 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("transient domain needs to request run or pause " - "to revert to inactive snapshot")); + _("transient domain needs to request run or pause t= o revert to inactive snapshot")); goto cleanup; } =20 --=20 2.41.0