From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 505A664782 for ; Fri, 28 Jan 2022 09:36:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 41FD42C248 for ; Fri, 28 Jan 2022 09:36:48 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id CC2082C23F for ; Fri, 28 Jan 2022 09:36:47 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9937C46CE0 for ; Fri, 28 Jan 2022 09:36:47 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 28 Jan 2022 09:36:47 +0100 Message-Id: <20220128083647.1422384-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.164 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH manager] fix tests in 'vzdump_new_test.pl' 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: , X-List-Received-Date: Fri, 28 Jan 2022 08:36:48 -0000 commmit a55cfb53 ("close #3476: vzdump: add job-init hook") introduces a 'cfs_update' in VZDump->new(), which overwrites our carefully prepared storage/vm config which can break the tests to prevent this, mock 'cfs_update' to do nothing, since we never want to load the 'real' configs during tests anyway fixes commit a55cfb5359f86adc2d3981cab032bbf8a0411931 Signed-off-by: Dominik Csapak --- test/vzdump_new_test.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/vzdump_new_test.pl b/test/vzdump_new_test.pl index 23676239..8cd73075 100755 --- a/test/vzdump_new_test.pl +++ b/test/vzdump_new_test.pl @@ -61,6 +61,10 @@ $pve_cluster_module->mock( die "unexpected filename '$filename'\n" if $filename ne 'storage.cfg'; return $storage_config; }, + # never update during the tests + cfs_update => sub { + return; + }, ); my $pve_tools_module = Test::MockModule->new('PVE::Tools'); -- 2.30.2