remove left-over mentions of to-be-dropped, outdated QMP commands

[qemu-server.git] / test / run_qemu_migrate_tests.pl

diff --git a/test/run_qemu_migrate_tests.pl b/test/run_qemu_migrate_tests.pl
index 0dffaa430e91a07ab9f7a62e38ca6baefd0ad35a..090449f3f56f51d08f7e6bd76e426d6c652635ff 100755 (executable)
--- a/test/run_qemu_migrate_tests.pl
+++ b/test/run_qemu_migrate_tests.pl
@@ -418,8 +418,9 @@ sub local_volids_for_vm {
 
 my $tests = [
 # each test consists of the following:
-# name           - unique name for the test which also serves as a dir name and
-#                  gets passed to make, so don't use whitespace or slash
+# name           - unique name for the test which also serves as a dir name.
+#                  NOTE: gets passed to make, so don't use whitespace or slash
+#                        and adapt buildsys (regex) on code structure changes
 # target         - hostname of target node
 # vmid           - ID of the VM to migrate
 # opts           - options for the migrate() call
@@ -678,7 +679,7 @@ my $tests = [
            'with-local-disks' => 1,
        },
        expected_calls => {},
-       expect_die => 'online storage migration not possible if snapshot exists',
+       expect_die => 'online storage migration not possible if non-replicated snapshot exists',
        expected => {
            source_volids => local_volids_for_vm(4567),
            target_volids => {},
@@ -1237,8 +1238,11 @@ my $tests = [
            'with-local-disks' => 1,
        },
        target_volids => local_volids_for_vm(105),
-       expected_calls => {},
-       expect_die => "online storage migration not possible if snapshot exists",
+       expected_calls => {
+           %{$replicated_expected_calls_online},
+           'block-dirty-bitmap-add-drive-scsi0' => 1,
+           'block-dirty-bitmap-add-drive-ide0' => 1,
+       },
        expected => {
            source_volids => local_volids_for_vm(105),
            target_volids => local_volids_for_vm(105),
@@ -1528,15 +1532,6 @@ my $tests = [
 
 my $single_test_name = shift;
 
-if (defined($single_test_name) && $single_test_name eq 'DUMP_NAMES') {
-    my $output = '';
-    foreach my $test (@{$tests}) {
-       $output .= $test->{name} . ' ';
-    }
-    print "$output\n";
-    exit 0;
-}
-
 mkdir $RUN_DIR_PATH;
 
 foreach my $test (@{$tests}) {