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 188C967121 for ; Mon, 11 Jan 2021 15:01:00 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 07A161B6E2 for ; Mon, 11 Jan 2021 15:00:30 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 60EB91B6D1 for ; Mon, 11 Jan 2021 15:00:29 +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 3564E453BC for ; Mon, 11 Jan 2021 15:00:29 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 11 Jan 2021 15:00:23 +0100 Message-Id: <20210111140024.13377-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.008 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 v2 qemu-server 1/2] tests: mock storage locking for migration 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: Mon, 11 Jan 2021 14:01:00 -0000 by doing it in a local directory instead of /var/lock/pve-manager, which is used by the installed/non-test PVE code. This also covers the shared case, which will become relevant after fixing #3229 (currently migration doesn't touch disks on shared storages). Reported-by: Stefan Reiter Signed-off-by: Fabian Ebner --- test/MigrationTest/Shared.pm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/MigrationTest/Shared.pm b/test/MigrationTest/Shared.pm index c09562c..d7aeb36 100644 --- a/test/MigrationTest/Shared.pm +++ b/test/MigrationTest/Shared.pm @@ -145,6 +145,18 @@ $storage_module->mock( }, ); +our $storage_plugin_module = Test::MockModule->new("PVE::Storage::Plugin"); +$storage_plugin_module->mock( + cluster_lock_storage => sub { + my ($class, $storeid, $shared, $timeout, $func, @param) = @_; + + mkdir "${RUN_DIR_PATH}/lock"; + + my $path = "${RUN_DIR_PATH}/lock/pve-storage-${storeid}"; + return PVE::Tools::lock_file($path, $timeout, $func, @param); + }, +); + our $systemd_module = Test::MockModule->new("PVE::Systemd"); $systemd_module->mock( wait_for_unit_removed => sub { -- 2.20.1