diff mbox

[2/2] iotests: Add test for rebasing with relative paths

Message ID 20180509154949.8206-3-mreitz@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Max Reitz May 9, 2018, 3:49 p.m. UTC 
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/024     | 82 ++++++++++++++++++++++++++++++++++++++++++++--
 tests/qemu-iotests/024.out | 30 +++++++++++++++++
 2 files changed, 109 insertions(+), 3 deletions(-)

Comments

Eric Blake May 9, 2018, 5:24 p.m. UTC | #1 
On 05/09/2018 10:49 AM, Max Reitz wrote:
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>   tests/qemu-iotests/024     | 82 ++++++++++++++++++++++++++++++++++++++++++++--
>   tests/qemu-iotests/024.out | 30 +++++++++++++++++
>   2 files changed, 109 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
> index e0d77ce2f5..4071ed6093 100755
> --- a/tests/qemu-iotests/024
> +++ b/tests/qemu-iotests/024
> @@ -29,9 +29,14 @@ status=1	# failure is the default!
>   
>   _cleanup()
>   {
> -	_cleanup_test_img
> -	rm -f "$TEST_DIR/t.$IMGFMT.base_old"
> -	rm -f "$TEST_DIR/t.$IMGFMT.base_new"
> +    _cleanup_test_img
> +    rm -f "$TEST_DIR/t.$IMGFMT.base_old"
> +    rm -f "$TEST_DIR/t.$IMGFMT.base_new"
> +
> +    rm -f "$TEST_DIR/subdir/t.$IMGFMT"
> +    rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_old"
> +    rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_new"
> +    rmdir "$TEST_DIR/subdir" 2> /dev/null

Any easier to just 'rm -rf "$TEST_DIR/subdir"' instead of calling out 
individual files?  And was Jeff ever going to finish the iotests 
cleanups that took care of cleanup globally by running tests in a 
per-test directory in preparation for running tests in parallel?

Reviewed-by: Eric Blake <eblake@redhat.com>
Max Reitz May 9, 2018, 5:58 p.m. UTC | #2 
On 2018-05-09 19:24, Eric Blake wrote:
> On 05/09/2018 10:49 AM, Max Reitz wrote:
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>>   tests/qemu-iotests/024     | 82
>> ++++++++++++++++++++++++++++++++++++++++++++--
>>   tests/qemu-iotests/024.out | 30 +++++++++++++++++
>>   2 files changed, 109 insertions(+), 3 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
>> index e0d77ce2f5..4071ed6093 100755
>> --- a/tests/qemu-iotests/024
>> +++ b/tests/qemu-iotests/024
>> @@ -29,9 +29,14 @@ status=1    # failure is the default!
>>     _cleanup()
>>   {
>> -    _cleanup_test_img
>> -    rm -f "$TEST_DIR/t.$IMGFMT.base_old"
>> -    rm -f "$TEST_DIR/t.$IMGFMT.base_new"
>> +    _cleanup_test_img
>> +    rm -f "$TEST_DIR/t.$IMGFMT.base_old"
>> +    rm -f "$TEST_DIR/t.$IMGFMT.base_new"
>> +
>> +    rm -f "$TEST_DIR/subdir/t.$IMGFMT"
>> +    rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_old"
>> +    rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_new"
>> +    rmdir "$TEST_DIR/subdir" 2> /dev/null
> 
> Any easier to just 'rm -rf "$TEST_DIR/subdir"' instead of calling out
> individual files?

Sure it would be easier, but I decided against it on the basis that I
personally don’t like to call rm -rf on cleanup.

(Because if I mess something up, I might hurt somebody really bad, and
that somebody might be myself.)

> And was Jeff ever going to finish the iotests
> cleanups that took care of cleanup globally by running tests in a
> per-test directory in preparation for running tests in parallel?

If that was a question to me, I’m afraid I don’t know the status of that...

Max

> Reviewed-by: Eric Blake <eblake@redhat.com>
diff mbox

Patch

diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
index e0d77ce2f5..4071ed6093 100755
--- a/tests/qemu-iotests/024
+++ b/tests/qemu-iotests/024
@@ -29,9 +29,14 @@  status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
-	rm -f "$TEST_DIR/t.$IMGFMT.base_old"
-	rm -f "$TEST_DIR/t.$IMGFMT.base_new"
+    _cleanup_test_img
+    rm -f "$TEST_DIR/t.$IMGFMT.base_old"
+    rm -f "$TEST_DIR/t.$IMGFMT.base_new"
+
+    rm -f "$TEST_DIR/subdir/t.$IMGFMT"
+    rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_old"
+    rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_new"
+    rmdir "$TEST_DIR/subdir" 2> /dev/null
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
@@ -123,6 +128,77 @@  io_pattern readv $((13 * CLUSTER_SIZE)) $CLUSTER_SIZE 0 1 0x00
 io_pattern readv $((14 * CLUSTER_SIZE)) $CLUSTER_SIZE 0 1 0x11
 io_pattern readv $((15 * CLUSTER_SIZE)) $CLUSTER_SIZE 0 1 0x00
 
+echo
+echo "=== Test rebase in a subdirectory of the working directory ==="
+echo
+
+# Clean up the old images beforehand so they do not interfere with
+# this test
+_cleanup
+
+mkdir "$TEST_DIR/subdir"
+
+# Relative to the overlay
+BASE_OLD_OREL="t.$IMGFMT.base_old"
+BASE_NEW_OREL="t.$IMGFMT.base_new"
+
+# Relative to $TEST_DIR (which is going to be our working directory)
+OVERLAY_WREL="subdir/t.$IMGFMT"
+
+BASE_OLD="$TEST_DIR/subdir/$BASE_OLD_OREL"
+BASE_NEW="$TEST_DIR/subdir/$BASE_NEW_OREL"
+OVERLAY="$TEST_DIR/$OVERLAY_WREL"
+
+# Test done here:
+#
+# Backing (old): 11 11 -- 11
+# Backing (new): -- 22 22 11
+# Overlay:       -- -- -- --
+#
+# Rebasing works, we have verified that above.  Here, we just want to
+# see that rebasing is done for the correct target backing file.
+
+TEST_IMG=$BASE_OLD _make_test_img 1M
+TEST_IMG=$BASE_NEW _make_test_img 1M
+TEST_IMG=$OVERLAY _make_test_img -b "$BASE_OLD_OREL" 1M
+
+echo
+
+$QEMU_IO "$BASE_OLD" \
+    -c "write -P 0x11 $((0 * CLUSTER_SIZE)) $((2 * CLUSTER_SIZE))" \
+    -c "write -P 0x11 $((3 * CLUSTER_SIZE)) $((1 * CLUSTER_SIZE))" \
+    | _filter_qemu_io
+
+$QEMU_IO "$BASE_NEW" \
+    -c "write -P 0x22 $((1 * CLUSTER_SIZE)) $((2 * CLUSTER_SIZE))" \
+    -c "write -P 0x11 $((3 * CLUSTER_SIZE)) $((1 * CLUSTER_SIZE))" \
+    | _filter_qemu_io
+
+echo
+
+pushd "$TEST_DIR" >/dev/null
+$QEMU_IMG rebase -f "$IMGFMT" -b "$BASE_NEW_OREL" "$OVERLAY_WREL"
+popd >/dev/null
+
+# Verify the backing path is correct
+TEST_IMG=$OVERLAY _img_info | grep '^backing file'
+
+echo
+
+# Verify the data is correct
+$QEMU_IO "$OVERLAY" \
+    -c "read -P 0x11 $((0 * CLUSTER_SIZE)) $CLUSTER_SIZE" \
+    -c "read -P 0x11 $((1 * CLUSTER_SIZE)) $CLUSTER_SIZE" \
+    -c "read -P 0x00 $((2 * CLUSTER_SIZE)) $CLUSTER_SIZE" \
+    -c "read -P 0x11 $((3 * CLUSTER_SIZE)) $CLUSTER_SIZE" \
+    | _filter_qemu_io
+
+echo
+
+# Verify that cluster #3 is not allocated (because it is the same in
+# $BASE_OLD and $BASE_NEW)
+$QEMU_IMG map "$OVERLAY" | _filter_qemu_img_map
+
 
 # success, all done
 echo "*** done"
diff --git a/tests/qemu-iotests/024.out b/tests/qemu-iotests/024.out
index 33cfaf5cfc..024dc786b3 100644
--- a/tests/qemu-iotests/024.out
+++ b/tests/qemu-iotests/024.out
@@ -141,4 +141,34 @@  read 65536/65536 bytes at offset 917504
 === IO: pattern 0x00
 read 65536/65536 bytes at offset 983040
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+=== Test rebase in a subdirectory of the working directory ===
+
+Formatting 'TEST_DIR/subdir/t.IMGFMT.base_old', fmt=IMGFMT size=1048576
+Formatting 'TEST_DIR/subdir/t.IMGFMT.base_new', fmt=IMGFMT size=1048576
+Formatting 'TEST_DIR/subdir/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=t.IMGFMT.base_old
+
+wrote 131072/131072 bytes at offset 0
+128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 65536/65536 bytes at offset 196608
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 131072/131072 bytes at offset 65536
+128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 65536/65536 bytes at offset 196608
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+backing file: t.IMGFMT.base_new (actual path: TEST_DIR/subdir/t.IMGFMT.base_new)
+
+read 65536/65536 bytes at offset 0
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+read 65536/65536 bytes at offset 65536
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+read 65536/65536 bytes at offset 131072
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+read 65536/65536 bytes at offset 196608
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+Offset          Length          File
+0               0x30000         TEST_DIR/subdir/t.IMGFMT
+0x30000         0x10000         TEST_DIR/subdir/t.IMGFMT.base_new
 *** done