diff --git a/src/test/MigrationTest/QemuMigrateMock.pm b/src/test/MigrationTest/QemuMigrateMock.pm index c715a60..3a48381 100644 --- a/src/test/MigrationTest/QemuMigrateMock.pm +++ b/src/test/MigrationTest/QemuMigrateMock.pm @@ -21,7 +21,6 @@ my $QM_LIB_PATH = $ENV{QM_LIB_PATH} or die "no QM_LIB_PATH set\n"; my $source_volids = decode_json(file_get_contents("${RUN_DIR_PATH}/source_volids")); my $source_vdisks = decode_json(file_get_contents("${RUN_DIR_PATH}/source_vdisks")); -my $source_other_volumes = decode_json(file_get_contents("${RUN_DIR_PATH}/source_other_volumes")); my $vm_status = decode_json(file_get_contents("${RUN_DIR_PATH}/vm_status")); my $expected_calls = decode_json(file_get_contents("${RUN_DIR_PATH}/expected_calls")); my $fail_config = decode_json(file_get_contents("${RUN_DIR_PATH}/fail_config")); @@ -305,11 +304,11 @@ $MigrationTest::Shared::storage_module->mock( my ($scfg, $volid) = @_; my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid); - for my $v ($source_vdisks->{$storeid}->@*, $source_other_volumes->{$storeid}->@*) { + for my $v ($source_vdisks->{$storeid}->@*) { return wantarray ? ($v->{size}, $v->{format}, $v->{used}, $v->{parent}) : $v->{size} if $v->{volid} eq $volid; } - die "could not find '$volid' in mock 'source_vdisks' or 'source_other_volumes'\n"; + die "could not find '$volid' in mock 'source_vdisks'\n"; }, ); diff --git a/src/test/run_qemu_migrate_tests.pl b/src/test/run_qemu_migrate_tests.pl index 37d5269..05eed1d 100644 --- a/src/test/run_qemu_migrate_tests.pl +++ b/src/test/run_qemu_migrate_tests.pl @@ -37,7 +37,6 @@ my $storage_config = { local => { content => { images => 1, - iso => 1, }, path => "/var/lib/vz", type => "dir", @@ -437,21 +436,6 @@ my $source_vdisks = { ], }; -# non-image volumes on the source, e.g. ISO images, in the same format as $source_vdisks. They -# are only used for the mocked volume_size_info(), because vdisk_list() only returns images. -my $source_other_volumes = { - 'local' => [ - { - 'ctime' => 1589439681, - 'format' => 'iso', - 'parent' => undef, - 'size' => 663748608, - 'used' => 663748608, - 'volid' => 'local:iso/debian.iso', - }, - ], -}; - my $default_expected_calls_online = { move_config_to_node => 1, ssh_qm_start => 1, @@ -1252,41 +1236,6 @@ my $tests = [ }, }, }, - { - name => '105_local_iso_in_snapshot', - target => 'pve1', - vmid => 105, - vm_status => { - running => 0, - }, - config_patch => { - snapshots => { - ohsnap => { - ide2 => 'local:iso/debian.iso,media=cdrom', - }, - }, - }, - expected_calls => {}, - expect_die => "can't migrate local disk 'local:iso/debian.iso': local cdrom image" - . " (referenced in snapshot - ohsnap)", - expected => { - source_volids => local_volids_for_vm(105), - target_volids => {}, - vm_config => get_patched_config( - 105, - { - snapshots => { - ohsnap => { - ide2 => 'local:iso/debian.iso,media=cdrom', - }, - }, - }, - ), - vm_status => { - running => 0, - }, - }, - }, { name => '105_cdrom', target => 'pve1', @@ -1783,7 +1732,6 @@ foreach my $test (@{$tests}) { file_set_contents("${run_dir}/replication_config", to_json($replication_config)); file_set_contents("${run_dir}/storage_config", to_json($storage_config)); file_set_contents("${run_dir}/source_vdisks", to_json($source_vdisks)); - file_set_contents("${run_dir}/source_other_volumes", to_json($source_other_volumes)); my $expect_die = $test->{expect_die}; my $expected = $test->{expected};