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 619559DA6B for ; Fri, 24 Nov 2023 14:17:00 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 44874FBA5 for ; Fri, 24 Nov 2023 14:17:00 +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 for ; Fri, 24 Nov 2023 14:16:59 +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 0B04F43BDD for ; Fri, 24 Nov 2023 14:16:59 +0100 (CET) From: Stefan Lendl To: pve-devel@lists.proxmox.com Date: Fri, 24 Nov 2023 14:16:13 +0100 Message-ID: <20231124131612.234972-2-s.lendl@proxmox.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.042 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-network] tests: mocking cfs_lock_file to pass subnet tests 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, 24 Nov 2023 13:17:00 -0000 IPAM tries to lock file in clusterfs which it can't when testing as non-root. Mocking cfs_lock_file to emulate locking behavior. Signed-off-by: Stefan Lendl --- src/test/run_test_subnets.pl | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/test/run_test_subnets.pl b/src/test/run_test_subnets.pl index 49b4205..7d57e99 100755 --- a/src/test/run_test_subnets.pl +++ b/src/test/run_test_subnets.pl @@ -18,6 +18,23 @@ use JSON; use Data::Dumper qw(Dumper); $Data::Dumper::Sortkeys = 1; + +my $locks = {}; + +my $mocked_cfs_lock_file = sub { + my ($filename, $timeout, $code, @param) = @_; + + die "$filename already locked\n" if ($locks->{$filename}); + + $locks->{$filename} = 1; + + my $res = eval { $code->(@param); }; + + delete $locks->{$filename}; + + return $res; +}; + sub read_sdn_config { my ($file) = @_; # Read structure back in again @@ -98,7 +115,8 @@ foreach my $path (@plugins) { write_db => sub { my ($cfg) = @_; $ipamdb = $cfg; - } + }, + cfs_lock_file => $mocked_cfs_lock_file, ); } -- 2.42.0