mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iotests: Make 110 work with data_file

Browse Source 
The only difference is that the json:{} filename of the image looks
different.  We actually do not care about that filename in this test, we
are only interested in (1) that there is a json:{} filename, and (2)
whether the backing filename can be constructed.

So just filter out the json:{} data, thus making this test pass both
with and without data_file.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-19-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Max Reitz 2019-11-07 17:37:04 +01:00
parent 990f9bcc73
commit d327a942aa
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/qemu-iotests/110
View File

@ -67,6 +67,7 @@ echo
# Across blkdebug without a config file, you cannot reconstruct filenames, so # Across blkdebug without a config file, you cannot reconstruct filenames, so
# qemu is incapable of knowing the directory of the top image from the filename # qemu is incapable of knowing the directory of the top image from the filename
# alone. However, using bdrv_dirname(), it should still work. # alone. However, using bdrv_dirname(), it should still work.
# (Filter out the json:{} filename so this test works with external data files)
TEST_IMG="json:{ TEST_IMG="json:{
'driver': '$IMGFMT', 'driver': '$IMGFMT',
'file': { 'file': {
@ -82,7 +83,8 @@ TEST_IMG="json:{
} }
] ]
} }
}" _img_info | _filter_img_info | grep -v 'backing file format' }" _img_info | _filter_img_info | grep -v 'backing file format' \
| _filter_json_filename
echo echo
echo '=== Backing name is always relative to the backed image ===' echo '=== Backing name is always relative to the backed image ==='
@ -114,7 +116,8 @@ TEST_IMG="json:{
} }
] ]
} }
}" _img_info | _filter_img_info | grep -v 'backing file format' }" _img_info | _filter_img_info | grep -v 'backing file format' \
| _filter_json_filename
# success, all done # success, all done

4
tests/qemu-iotests/110.out
View File

@ -11,7 +11,7 @@ backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
=== Non-reconstructable filename === === Non-reconstructable filename ===
image: json:{"driver": "IMGFMT", "file": {"set-state.0.event": "read_aio", "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "set-state.0.new_state": 42}} image: json:{ /* filtered */ }
file format: IMGFMT file format: IMGFMT
virtual size: 64 MiB (67108864 bytes) virtual size: 64 MiB (67108864 bytes)
backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base) backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
@ -22,7 +22,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.b
=== Nodes without a common directory === === Nodes without a common directory ===
image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "vote-threshold": 1}} image: json:{ /* filtered */ }
file format: IMGFMT file format: IMGFMT
virtual size: 64 MiB (67108864 bytes) virtual size: 64 MiB (67108864 bytes)
backing file: t.IMGFMT.base (cannot determine actual path) backing file: t.IMGFMT.base (cannot determine actual path)