From 8b26544e5057b6b5e7df5d821464f78ea4372185 Mon Sep 17 00:00:00 2001 From: Stefan Reiter Date: Wed, 4 Dec 2019 13:15:50 +0100 Subject: [PATCH] cfg2cmd: minor cleanup We never shipped a 4.1.0 QEMU, so it makes more sense to test as 4.1.1 Signed-off-by: Stefan Reiter --- test/cfg2cmd/spice-linux-4.1.conf | 2 +- test/run_config2command_tests.pl | 2 +- test/snapshot-test.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/cfg2cmd/spice-linux-4.1.conf b/test/cfg2cmd/spice-linux-4.1.conf index 24d26767..e484a94b 100644 --- a/test/cfg2cmd/spice-linux-4.1.conf +++ b/test/cfg2cmd/spice-linux-4.1.conf @@ -1,5 +1,5 @@ # TEST: Test for SPICE with SPICE with max_outputs -# QEMU_VERSION: 4.1.0 +# QEMU_VERSION: 4.1.1 cores: 2 memory: 768 name: spicelinux diff --git a/test/run_config2command_tests.pl b/test/run_config2command_tests.pl index 84ad864c..a8264198 100755 --- a/test/run_config2command_tests.pl +++ b/test/run_config2command_tests.pl @@ -237,7 +237,7 @@ sub do_test($) { my $cmd_expected = [ split /\s*\\?\n\s*/, $cmdline_expected ]; my $cmd = [ split /\s*\\?\n\s*/, $cmdline ]; - # comment out for easier debugging + # uncomment for easier debugging #file_set_contents("$cmd_fn.tmp", $cmdline); my $exp = join("\n", @$cmd_expected); diff --git a/test/snapshot-test.pm b/test/snapshot-test.pm index ed5acb96..ee9fc13f 100644 --- a/test/snapshot-test.pm +++ b/test/snapshot-test.pm @@ -315,7 +315,7 @@ sub vm_running_locally { # BEGIN mocked PVE::QemuServer::Monitor methods sub qmp_cmd { - my ($vmid, $cmd, $nocheck) = @_; + my ($vmid, $cmd) = @_; my $exec = $cmd->{execute}; if ($exec eq "delete-drive-snapshot") {