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 D4F80A1103 for ; Fri, 10 Nov 2023 14:25:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ABE536F6 for ; Fri, 10 Nov 2023 14:24:56 +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, 10 Nov 2023 14:24:55 +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 4E29347A91 for ; Fri, 10 Nov 2023 14:24:55 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 10 Nov 2023 14:24:50 +0100 Message-Id: <20231110132451.67482-7-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231110132451.67482-1-f.ebner@proxmox.com> References: <20231110132451.67482-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.079 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 qemu-server 5/6] test: migration: mock get_current_qemu_machine 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, 10 Nov 2023 13:25:26 -0000 by remembering the 'forcemachine' parameter that's passed along when starting the target instance. In preparation to introduce a call to get_current_qemu_machine after starting a VM to check for machine version deprecation. Signed-off-by: Fiona Ebner --- test/MigrationTest/QmMock.pm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/MigrationTest/QmMock.pm b/test/MigrationTest/QmMock.pm index e34686e3..fb94c58b 100644 --- a/test/MigrationTest/QmMock.pm +++ b/test/MigrationTest/QmMock.pm @@ -23,6 +23,7 @@ my $migrate_params = decode_json(file_get_contents("${RUN_DIR_PATH}/migrate_para my $nodename = $migrate_params->{target}; my $kvm_exectued = 0; +my $forcemachine; sub setup_environment { my $rpcenv = PVE::RPCEnvironment::init('MigrationTest::QmMock', 'cli'); @@ -56,6 +57,12 @@ $MigrationTest::Shared::qemu_server_module->mock( config_to_command => sub { return [ 'mocked_kvm_command' ]; }, + vm_start_nolock => sub { + my ($storecfg, $vmid, $conf, $params, $migrate_opts) = @_; + $forcemachine = $params->{forcemachine} + or die "mocked vm_start_nolock - expected 'forcemachine' parameter\n"; + $MigrationTest::Shared::qemu_server_module->original('vm_start_nolock')->(@_); + }, ); my $qemu_server_helpers_module = Test::MockModule->new("PVE::QemuServer::Helpers"); @@ -65,6 +72,13 @@ $qemu_server_helpers_module->mock( }, ); +our $qemu_server_machine_module = Test::MockModule->new("PVE::QemuServer::Machine"); +$qemu_server_machine_module->mock( + get_current_qemu_machine => sub { + return wantarray ? ($forcemachine, 0) : $forcemachine; + }, +); + # to make sure we get valid and predictable names my $disk_counter = 10; -- 2.39.2