Upstream proxmox-git/qemu-server state of the touched files before 5abda8579b
This commit is contained in:
1 parent
55a24d220e
commit
b5d4ad6a33
2 files changed
+2
-55
No files matched your search
@@ -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";
|
||||
},
|
||||
);
|
||||
|
||||
|
||||
Reference in new issue
Block a user