From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id E4E461FF166 for ; Fri, 25 Oct 2024 17:03:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6831231CFB; Fri, 25 Oct 2024 17:03:03 +0200 (CEST) From: Daniel Herzig To: pve-devel@lists.proxmox.com Date: Fri, 25 Oct 2024 17:02:35 +0200 Message-Id: <20241025150243.134466-5-d.herzig@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241025150243.134466-1-d.herzig@proxmox.com> References: <20241025150243.134466-1-d.herzig@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.049 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server 4/12] test: chomp all trailing newlines from errors and warnings X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Ease EXPECT_ERROR and EXPECT_WARN string matching with errors/warnings that have more than one trailing newline. Signed-off-by: Daniel Herzig --- test/run_config2command_tests.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/run_config2command_tests.pl b/test/run_config2command_tests.pl index 8c525f09..2911483e 100755 --- a/test/run_config2command_tests.pl +++ b/test/run_config2command_tests.pl @@ -426,7 +426,9 @@ sub diff($$) { $SIG{__WARN__} = sub { my $warning = shift; - chomp $warning; + while ((chomp($warning))) { + chomp($warning); + } if (my $warn_expect = $current_test->{expect_warning}) { if ($warn_expect ne $warning) { fail($current_test->{testname}); @@ -461,7 +463,9 @@ sub do_test($) { note("did NOT get any error, but expected error: $err_expect"); return; } - chomp $err; + while ((chomp($err))) { + chomp($err); + } if ($err ne $err_expect) { fail("$testname"); note("error does not match expected error: '$err' !~ '$err_expect'"); -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel