diff mbox series

[12/18] iotests: Avoid cp/mv of test images

Message ID 20190927094242.11152-13-mreitz@redhat.com
State New
Headers show
Series iotests: Allow ./check -o data_file | expand

Commit Message

Max Reitz Sept. 27, 2019, 9:42 a.m. UTC 
This will not work with external data files, so try to get tests working
without it as far as possible.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/063     | 12 ++++--------
 tests/qemu-iotests/063.out |  3 ++-
 tests/qemu-iotests/085     |  9 +++------
 tests/qemu-iotests/085.out |  8 ++++----
 4 files changed, 13 insertions(+), 19 deletions(-)

Comments

Maxim Levitsky Sept. 29, 2019, 4:33 p.m. UTC | #1 
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> This will not work with external data files, so try to get tests working
> without it as far as possible.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  tests/qemu-iotests/063     | 12 ++++--------
>  tests/qemu-iotests/063.out |  3 ++-
>  tests/qemu-iotests/085     |  9 +++------
>  tests/qemu-iotests/085.out |  8 ++++----
>  4 files changed, 13 insertions(+), 19 deletions(-)
> 
> diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
> index eef2b8a534..c750b3806e 100755
> --- a/tests/qemu-iotests/063
> +++ b/tests/qemu-iotests/063
> @@ -51,15 +51,13 @@ _unsupported_imgopts "subformat=monolithicFlat" \
>  _make_test_img 4M
>  
>  echo "== Testing conversion with -n fails with no target file =="
> -# check .orig file does not exist
> -rm -f "$TEST_IMG.orig"
>  if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" >/dev/null 2>&1; then
>      exit 1
>  fi
>  
>  echo "== Testing conversion with -n succeeds with a target file =="
> -rm -f "$TEST_IMG.orig"
> -cp "$TEST_IMG" "$TEST_IMG.orig"
> +_rm_test_img "$TEST_IMG.orig"
> +TEST_IMG="$TEST_IMG.orig" _make_test_img 4M
>  if ! $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" ; then
>      exit 1
>  fi
> @@ -85,10 +83,8 @@ fi
>  _check_test_img
>  
>  echo "== Testing conversion to a smaller file fails =="
> -rm -f "$TEST_IMG.orig"
> -mv "$TEST_IMG" "$TEST_IMG.orig"
> -_make_test_img 2M
> -if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev/null 2>&1; then
> +TEST_IMG="$TEST_IMG.target" _make_test_img 2M
> +if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.target" >/dev/null 2>&1; then
>      exit 1
>  fi
>  
> diff --git a/tests/qemu-iotests/063.out b/tests/qemu-iotests/063.out
> index 7b691b2c9e..890b719bf0 100644
> --- a/tests/qemu-iotests/063.out
> +++ b/tests/qemu-iotests/063.out
> @@ -2,11 +2,12 @@ QA output created by 063
>  Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304
>  == Testing conversion with -n fails with no target file ==
>  == Testing conversion with -n succeeds with a target file ==
> +Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=4194304
>  == Testing conversion to raw is the same after conversion with -n ==
>  == Testing conversion back to original format ==
>  No errors were found on the image.
>  == Testing conversion to a smaller file fails ==
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
> +Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=2097152
>  == Regression testing for copy offloading bug ==
>  Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
>  Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=1048576
> diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
> index bbea1252d2..46981dbb64 100755
> --- a/tests/qemu-iotests/085
> +++ b/tests/qemu-iotests/085
> @@ -105,8 +105,7 @@ add_snapshot_image()
>  {
>      base_image="${TEST_DIR}/$((${1}-1))-${snapshot_virt0}"
>      snapshot_file="${TEST_DIR}/${1}-${snapshot_virt0}"
> -    _make_test_img -u -b "${base_image}" "$size"
> -    mv "${TEST_IMG}" "${snapshot_file}"
> +    TEST_IMG=$snapshot_file _make_test_img -u -b "${base_image}" "$size"
>      do_blockdev_add "$1" "'backing': null, " "${snapshot_file}"
>  }
>  
> @@ -122,10 +121,8 @@ blockdev_snapshot()
>  
>  size=128M
>  
> -_make_test_img $size
> -mv "${TEST_IMG}" "${TEST_IMG}.1"
> -_make_test_img $size
> -mv "${TEST_IMG}" "${TEST_IMG}.2"
> +TEST_IMG="$TEST_IMG.1" _make_test_img $size
> +TEST_IMG="$TEST_IMG.2" _make_test_img $size
>  
>  echo
>  echo === Running QEMU ===
> diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out
> index 2a5f256cd3..313198f182 100644
> --- a/tests/qemu-iotests/085.out
> +++ b/tests/qemu-iotests/085.out
> @@ -1,6 +1,6 @@
>  QA output created by 085
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> +Formatting 'TEST_DIR/t.IMGFMT.1', fmt=IMGFMT size=134217728
> +Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=134217728
>  
>  === Running QEMU ===
>  
> @@ -55,10 +55,10 @@ Formatting 'TEST_DIR/10-snapshot-v1.qcow2', fmt=qcow2 size=134217728 backing_fil
>  
>  === Create a couple of snapshots using blockdev-snapshot ===
>  
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
> +Formatting 'TEST_DIR/11-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
>  {"return": {}}
>  {"return": {}}
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
> +Formatting 'TEST_DIR/12-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
>  {"return": {}}
>  {"return": {}}
>  
Looks good.
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
diff mbox series

Patch

diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index eef2b8a534..c750b3806e 100755
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -51,15 +51,13 @@  _unsupported_imgopts "subformat=monolithicFlat" \
 _make_test_img 4M
 
 echo "== Testing conversion with -n fails with no target file =="
-# check .orig file does not exist
-rm -f "$TEST_IMG.orig"
 if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" >/dev/null 2>&1; then
     exit 1
 fi
 
 echo "== Testing conversion with -n succeeds with a target file =="
-rm -f "$TEST_IMG.orig"
-cp "$TEST_IMG" "$TEST_IMG.orig"
+_rm_test_img "$TEST_IMG.orig"
+TEST_IMG="$TEST_IMG.orig" _make_test_img 4M
 if ! $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" ; then
     exit 1
 fi
@@ -85,10 +83,8 @@  fi
 _check_test_img
 
 echo "== Testing conversion to a smaller file fails =="
-rm -f "$TEST_IMG.orig"
-mv "$TEST_IMG" "$TEST_IMG.orig"
-_make_test_img 2M
-if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev/null 2>&1; then
+TEST_IMG="$TEST_IMG.target" _make_test_img 2M
+if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.target" >/dev/null 2>&1; then
     exit 1
 fi
 
diff --git a/tests/qemu-iotests/063.out b/tests/qemu-iotests/063.out
index 7b691b2c9e..890b719bf0 100644
--- a/tests/qemu-iotests/063.out
+++ b/tests/qemu-iotests/063.out
@@ -2,11 +2,12 @@  QA output created by 063
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304
 == Testing conversion with -n fails with no target file ==
 == Testing conversion with -n succeeds with a target file ==
+Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=4194304
 == Testing conversion to raw is the same after conversion with -n ==
 == Testing conversion back to original format ==
 No errors were found on the image.
 == Testing conversion to a smaller file fails ==
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
+Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=2097152
 == Regression testing for copy offloading bug ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
 Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=1048576
diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
index bbea1252d2..46981dbb64 100755
--- a/tests/qemu-iotests/085
+++ b/tests/qemu-iotests/085
@@ -105,8 +105,7 @@  add_snapshot_image()
 {
     base_image="${TEST_DIR}/$((${1}-1))-${snapshot_virt0}"
     snapshot_file="${TEST_DIR}/${1}-${snapshot_virt0}"
-    _make_test_img -u -b "${base_image}" "$size"
-    mv "${TEST_IMG}" "${snapshot_file}"
+    TEST_IMG=$snapshot_file _make_test_img -u -b "${base_image}" "$size"
     do_blockdev_add "$1" "'backing': null, " "${snapshot_file}"
 }
 
@@ -122,10 +121,8 @@  blockdev_snapshot()
 
 size=128M
 
-_make_test_img $size
-mv "${TEST_IMG}" "${TEST_IMG}.1"
-_make_test_img $size
-mv "${TEST_IMG}" "${TEST_IMG}.2"
+TEST_IMG="$TEST_IMG.1" _make_test_img $size
+TEST_IMG="$TEST_IMG.2" _make_test_img $size
 
 echo
 echo === Running QEMU ===
diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out
index 2a5f256cd3..313198f182 100644
--- a/tests/qemu-iotests/085.out
+++ b/tests/qemu-iotests/085.out
@@ -1,6 +1,6 @@ 
 QA output created by 085
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Formatting 'TEST_DIR/t.IMGFMT.1', fmt=IMGFMT size=134217728
+Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=134217728
 
 === Running QEMU ===
 
@@ -55,10 +55,10 @@  Formatting 'TEST_DIR/10-snapshot-v1.qcow2', fmt=qcow2 size=134217728 backing_fil
 
 === Create a couple of snapshots using blockdev-snapshot ===
 
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
+Formatting 'TEST_DIR/11-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
 {"return": {}}
 {"return": {}}
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
+Formatting 'TEST_DIR/12-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
 {"return": {}}
 {"return": {}}