]> git.proxmox.com Git - qemu-server.git/commitdiff
tests: mock storage locking for migration tests
authorFabian Ebner <f.ebner@proxmox.com>
Mon, 11 Jan 2021 12:34:09 +0000 (13:34 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Tue, 12 Jan 2021 10:56:55 +0000 (11:56 +0100)
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@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
test/MigrationTest/Shared.pm

index c09562c3e63dd0021f832e90a695f2182dd6fdb1..d7aeb36aacd892f6a445338f37cdf00f4e41e20a 100644 (file)
@@ -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 {