mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

v2v: ova: Normalize the output in test case.

Browse Source 
Fixes commit 8f91d3a9b0.
This commit is contained in:
Richard W.M. Jones
2017-02-07 18:50:52 +00:00
parent fa6016af19
commit 7461a8fab1
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
v2v/test-v2v-i-ova-subfolders.expected2
View File

@@ -10,7 +10,7 @@ hypervisor type: vmware
video:
sound:
disks:
json:{ "file": { "driver": "raw", "offset": 2048, "size": 10240, "file": { "filename": "test.ova" } } } (vmdk) [scsi]
json:{ "file": { "driver": "raw", "offset": x, "size": 10240, "file": { "filename": "test.ova" } } } (vmdk) [scsi]
removable media:
CD-ROM [ide] in slot 0
NICs:

7
v2v/test-v2v-i-ova-subfolders.sh
View File

@@ -60,8 +60,11 @@ $VG virt-v2v --debug-gc --quiet \
# Check the parsed source is what we expect.
if qemu_is_version 2 8 ; then
# normalize the output
sed -i -e "s,\"$d/,\"," $d/source
# Normalize the output.
# Remove directory prefix.
# Exact offset will vary because of tar.
sed -i -e "s,\"$d/,\"," \
-e "s|\"offset\": [0-9]*,|\"offset\": x,|" $d/source
diff -u test-v2v-i-ova-subfolders.expected2 $d/source
else
# normalize the output