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 045611FF168 for ; Tue, 4 Mar 2025 11:44:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 054FC1B2BE; Tue, 4 Mar 2025 11:44:24 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 4 Mar 2025 11:44:06 +0100 Message-Id: <20250304104413.38638-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304104413.38638-1-f.ebner@proxmox.com> References: <20250304104413.38638-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.043 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 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 05/12] test: restore config: use diff to make failure human-readable 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" Signed-off-by: Fiona Ebner --- test/run_qemu_restore_config_tests.pl | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/run_qemu_restore_config_tests.pl b/test/run_qemu_restore_config_tests.pl index 1e1e8072..231975c6 100755 --- a/test/run_qemu_restore_config_tests.pl +++ b/test/run_qemu_restore_config_tests.pl @@ -80,9 +80,14 @@ dir_glob_foreach('./restore-config-input', '[0-9]+.conf', sub { ); } - my $expected = file_get_contents("${EXPECTED_DIR}/${file}"); - - is_deeply($got, $expected, $file); + my $cmd = ['diff', '-u', "${EXPECTED_DIR}/${file}", '-']; + eval { PVE::Tools::run_command($cmd, input => $got); }; + if (my $err = $@) { + note($err); + fail($file); + } else { + pass($file); + } }); done_testing(); -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel