Skip to content

Commit 0f07c9b

Browse files
committed
Fix remaing hardcoded device name
The tests was using a hardcoded xvdb which worked because it matches the default naming. Signed-off-by: Gaëtan Lehmann <gaetan.lehmann@vates.tech>
1 parent 80307c9 commit 0f07c9b

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

tests/storage/storage.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,9 @@ def vdi_export_import(vm: VM, sr: SR, image_format: ImageFormat, temp_large_dir:
301301
defer(lambda: vdi_dest.destroy())
302302

303303
vm.host.xe('vdi-import', {'uuid': vdi_dest.uuid, 'filename': image_path, 'format': image_format})
304-
vm.connect_vdi(vdi_dest, 'xvdb')
304+
vbd = vm.connect_vdi(vdi_dest)
305305
defer(lambda: vm.disconnect_vdi(vdi_dest))
306+
dev = f'/dev/{vbd.param_get("device")}'
306307

307308
randstream(vm, f'validate --size {stream_size} --expected-checksum {checksum1} {dev}')
308309
randstream(vm, f'validate --position {stream_position} --size {stream_size} --expected-checksum {checksum2} {dev}')

tests/storage/zfsvol/test_zfsvol_sr.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ def test_vdi_export_import(
127127
defer(lambda: vdi_dest.destroy())
128128

129129
vm.host.xe('vdi-import', {'uuid': vdi_dest.uuid, 'filename': image_path, 'format': image_format})
130-
vm.connect_vdi(vdi_dest, 'xvdb')
130+
vbd = vm.connect_vdi(vdi_dest)
131131
defer(lambda: vm.disconnect_vdi(vdi_dest))
132+
dev = f'/dev/{vbd.param_get("device")}'
132133

133134
randstream(vm, f'validate --size {stream_size} --expected-checksum {checksum1} {dev}')
134135
randstream(

0 commit comments

Comments
 (0)