[pve-devel] [PATCH v2 qemu-server 1/2] tests: mock storage locking for migration tests

Fabian Ebner f.ebner at proxmox.com
Mon Jan 11 15:00:23 CET 2021


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 <s.reiter at proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
---
 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





More information about the pve-devel mailing list