[3/3] qemu-iotests: fix 017 018 for vmdk
diff mbox

Message ID 1367925185-12988-4-git-send-email-famz@redhat.com
State New
Headers show

Commit Message

Fam Zheng May 7, 2013, 11:13 a.m. UTC
017 and 018 use /bin/mv to move base img from t.IMGFMG to t.IMGFMT.base
after filling data, this is not enough for vmdk, when t.IMGFMT is only a
description text file who points to t-{flat,s001,f001,...}.IMGFMT as
data extent, so testing such subformats alway fails on them.

This patch use the trick of temprorily changing TEST_IMG to avoid using
/bin/mv.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/qemu-iotests/017     | 4 +++-
 tests/qemu-iotests/017.out | 2 +-
 tests/qemu-iotests/018     | 4 +++-
 tests/qemu-iotests/018.out | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

Comments

Jeff Cody May 7, 2013, 6:21 p.m. UTC | #1
On Tue, May 07, 2013 at 07:13:05PM +0800, Fam Zheng wrote:
> 017 and 018 use /bin/mv to move base img from t.IMGFMG to t.IMGFMT.base
> after filling data, this is not enough for vmdk, when t.IMGFMT is only a
> description text file who points to t-{flat,s001,f001,...}.IMGFMT as
> data extent, so testing such subformats alway fails on them.
> 
> This patch use the trick of temprorily changing TEST_IMG to avoid using
> /bin/mv.

s/temprorily/temporarily/


Other than that, I ran the tests locally here and verified vmdk, qcow,
qcow2, and qed pass both 17 and 18, so the patch itself looks good to
me.

> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/qemu-iotests/017     | 4 +++-
>  tests/qemu-iotests/017.out | 2 +-
>  tests/qemu-iotests/018     | 4 +++-
>  tests/qemu-iotests/018.out | 2 +-
>  4 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
> index 66951eb..45f2c0b 100755
> --- a/tests/qemu-iotests/017
> +++ b/tests/qemu-iotests/017
> @@ -46,6 +46,8 @@ _supported_os Linux
>  
>  TEST_OFFSETS="0 4294967296"
>  
> +TEST_IMG_SAVE=$TEST_IMG
> +TEST_IMG=$TEST_IMG.base
>  _make_test_img 6G
>  
>  echo "Filling base image"
> @@ -63,7 +65,7 @@ _check_test_img
>  echo "Creating test image with backing file"
>  echo
>  
> -mv $TEST_IMG $TEST_IMG.base
> +TEST_IMG=$TEST_IMG_SAVE
>  _make_test_img -b $TEST_IMG.base 6G
>  
>  echo "Filling test image"
> diff --git a/tests/qemu-iotests/017.out b/tests/qemu-iotests/017.out
> index a861e58..df34ee7 100644
> --- a/tests/qemu-iotests/017.out
> +++ b/tests/qemu-iotests/017.out
> @@ -1,5 +1,5 @@
>  QA output created by 017
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 
> +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944
>  Filling base image
>  
>  === IO: pattern 0
> diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
> index bd2db78..453ce61 100755
> --- a/tests/qemu-iotests/018
> +++ b/tests/qemu-iotests/018
> @@ -46,6 +46,8 @@ _supported_os Linux
>  
>  TEST_OFFSETS="0 4294967296"
>  
> +TEST_IMG_SAVE=$TEST_IMG
> +TEST_IMG=$TEST_IMG.base
>  _make_test_img 6G
>  
>  echo "Filling base image"
> @@ -63,7 +65,7 @@ _check_test_img
>  echo "Creating test image with backing file"
>  echo
>  
> -mv $TEST_IMG $TEST_IMG.base
> +TEST_IMG=$TEST_IMG_SAVE
>  _make_test_img -b $TEST_IMG.base 6G
>  
>  echo "Filling test image"
> diff --git a/tests/qemu-iotests/018.out b/tests/qemu-iotests/018.out
> index 6bbd815..3ddb8d8 100644
> --- a/tests/qemu-iotests/018.out
> +++ b/tests/qemu-iotests/018.out
> @@ -1,5 +1,5 @@
>  QA output created by 018
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 
> +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944
>  Filling base image
>  
>  === IO: pattern 0
> -- 
> 1.8.1.4
> 
>

Patch
diff mbox

diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index 66951eb..45f2c0b 100755
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017
@@ -46,6 +46,8 @@  _supported_os Linux
 
 TEST_OFFSETS="0 4294967296"
 
+TEST_IMG_SAVE=$TEST_IMG
+TEST_IMG=$TEST_IMG.base
 _make_test_img 6G
 
 echo "Filling base image"
@@ -63,7 +65,7 @@  _check_test_img
 echo "Creating test image with backing file"
 echo
 
-mv $TEST_IMG $TEST_IMG.base
+TEST_IMG=$TEST_IMG_SAVE
 _make_test_img -b $TEST_IMG.base 6G
 
 echo "Filling test image"
diff --git a/tests/qemu-iotests/017.out b/tests/qemu-iotests/017.out
index a861e58..df34ee7 100644
--- a/tests/qemu-iotests/017.out
+++ b/tests/qemu-iotests/017.out
@@ -1,5 +1,5 @@ 
 QA output created by 017
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944
 Filling base image
 
 === IO: pattern 0
diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
index bd2db78..453ce61 100755
--- a/tests/qemu-iotests/018
+++ b/tests/qemu-iotests/018
@@ -46,6 +46,8 @@  _supported_os Linux
 
 TEST_OFFSETS="0 4294967296"
 
+TEST_IMG_SAVE=$TEST_IMG
+TEST_IMG=$TEST_IMG.base
 _make_test_img 6G
 
 echo "Filling base image"
@@ -63,7 +65,7 @@  _check_test_img
 echo "Creating test image with backing file"
 echo
 
-mv $TEST_IMG $TEST_IMG.base
+TEST_IMG=$TEST_IMG_SAVE
 _make_test_img -b $TEST_IMG.base 6G
 
 echo "Filling test image"
diff --git a/tests/qemu-iotests/018.out b/tests/qemu-iotests/018.out
index 6bbd815..3ddb8d8 100644
--- a/tests/qemu-iotests/018.out
+++ b/tests/qemu-iotests/018.out
@@ -1,5 +1,5 @@ 
 QA output created by 018
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944
 Filling base image
 
 === IO: pattern 0