Skip to content

Commit

Permalink
iotests/046: Avoid renaming images
Browse files Browse the repository at this point in the history
This generally does not work on non-file protocols.  It is better to
create the image with the final name from the start, and most tests do
this already.  Let 046 follow suit.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201027190600.192171-11-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
XanClic authored and kevmw committed Dec 11, 2020
1 parent 620a628 commit 63c17df
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions tests/qemu-iotests/046
Expand Up @@ -47,6 +47,8 @@ size=128M
echo
echo "== creating backing file for COW tests =="

TEST_IMG_SAVE=$TEST_IMG
TEST_IMG="$TEST_IMG.base"
_make_test_img $size

backing_io()
Expand All @@ -67,8 +69,7 @@ backing_io()

backing_io 0 32 write | $QEMU_IO "$TEST_IMG" | _filter_qemu_io

mv "$TEST_IMG" "$TEST_IMG.base"

TEST_IMG=$TEST_IMG_SAVE
_make_test_img -b "$TEST_IMG.base" -F $IMGFMT 6G

echo
Expand Down
2 changes: 1 addition & 1 deletion tests/qemu-iotests/046.out
@@ -1,7 +1,7 @@
QA output created by 046

== creating backing file for COW tests ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728
wrote 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
wrote 65536/65536 bytes at offset 65536
Expand Down

0 comments on commit 63c17df

Please sign in to comment.