[pve-devel] [PATCH qemu-server] tests: mock storage locking for migration tests

[pve-devel] [PATCH qemu-server] tests: mock storage locking for migration tests

[Fabian Ebner]

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 | 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

Re: [pve-devel] [PATCH qemu-server] tests: mock storage locking for migration tests

[Stefan Reiter]

On 1/11/21 1:34 PM, Fabian Ebner wrote:
> 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>
Fixes the issue, though it still fails if you have previously made a 
build as root, since 'MigrationTest/run' will have the wrong 
permissions. Maybe include that dir in 'make clean'?

[pve-devel] applied: [PATCH qemu-server] tests: mock storage locking for migration tests

[Thomas Lamprecht]

On 11.01.21 13:34, Fabian Ebner wrote:
> 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 | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
>

applied, thanks!

Added removing the MigrationTest/run runtime directory to the make clean
target(s) as Stefan suggested.