diff mbox

[v2,2/2] qemu-iotests: add monolithicFlat creation test to 059

Message ID 1380071674-11176-3-git-send-email-famz@redhat.com
State New
Headers show

Commit Message

Fam Zheng Sept. 25, 2013, 1:14 a.m. UTC
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/qemu-iotests/059     | 5 +++++
 tests/qemu-iotests/059.out | 7 +++++++
 2 files changed, 12 insertions(+)

Comments

Kevin Wolf Sept. 25, 2013, 8:27 a.m. UTC | #1
Am 25.09.2013 um 03:14 hat Fam Zheng geschrieben:
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/qemu-iotests/059     | 5 +++++
>  tests/qemu-iotests/059.out | 7 +++++++
>  2 files changed, 12 insertions(+)
> 
> diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
> index b03429d..4bab098 100755
> --- a/tests/qemu-iotests/059
> +++ b/tests/qemu-iotests/059
> @@ -66,6 +66,11 @@ poke_file "$TEST_IMG" "$capacity_offset" "\xff\xff\xff\xff"
>  poke_file "$TEST_IMG" "$grain_table_size_offset" "\x01\x00\x00\x00"
>  { $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
>  
> +echo "=== Testing monolithicFlat creation and opening ==="
> +echo
> +IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
> +$QEMU_IMG info $TEST_IMG
> +
>  # success, all done
>  echo "*** done"
>  rm -f $seq.full
> diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
> index 2146a1a..9b064b8 100644
> --- a/tests/qemu-iotests/059.out
> +++ b/tests/qemu-iotests/059.out
> @@ -17,4 +17,11 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
>  L1 size too big
>  qemu-io: can't open device TEST_DIR/t.vmdk: Could not open 'TEST_DIR/t.vmdk': Wrong medium type
>  no file open, try 'help open'
> +=== Testing monolithicFlat creation and opening ===
> +
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> +image: /home/fam/qemu/tests/qemu-iotests/scratch/t.vmdk

You want to _filter_testdir the output. :-)

> +file format: vmdk
> +virtual size: 64M (67108864 bytes)
> +disk size: 4.0K
>  *** done

Kevin
Fam Zheng Sept. 25, 2013, 8:38 a.m. UTC | #2
On Wed, 09/25 10:27, Kevin Wolf wrote:
> Am 25.09.2013 um 03:14 hat Fam Zheng geschrieben:
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> >  tests/qemu-iotests/059     | 5 +++++
> >  tests/qemu-iotests/059.out | 7 +++++++
> >  2 files changed, 12 insertions(+)
> > 
> > diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
> > index b03429d..4bab098 100755
> > --- a/tests/qemu-iotests/059
> > +++ b/tests/qemu-iotests/059
> > @@ -66,6 +66,11 @@ poke_file "$TEST_IMG" "$capacity_offset" "\xff\xff\xff\xff"
> >  poke_file "$TEST_IMG" "$grain_table_size_offset" "\x01\x00\x00\x00"
> >  { $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
> >  
> > +echo "=== Testing monolithicFlat creation and opening ==="
> > +echo
> > +IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
> > +$QEMU_IMG info $TEST_IMG
> > +
> >  # success, all done
> >  echo "*** done"
> >  rm -f $seq.full
> > diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
> > index 2146a1a..9b064b8 100644
> > --- a/tests/qemu-iotests/059.out
> > +++ b/tests/qemu-iotests/059.out
> > @@ -17,4 +17,11 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> >  L1 size too big
> >  qemu-io: can't open device TEST_DIR/t.vmdk: Could not open 'TEST_DIR/t.vmdk': Wrong medium type
> >  no file open, try 'help open'
> > +=== Testing monolithicFlat creation and opening ===
> > +
> > +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> > +image: /home/fam/qemu/tests/qemu-iotests/scratch/t.vmdk
> 
> You want to _filter_testdir the output. :-)
> 

Oops! Otherwise only _fam_ can pass the test!

Fam
diff mbox

Patch

diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
index b03429d..4bab098 100755
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059
@@ -66,6 +66,11 @@  poke_file "$TEST_IMG" "$capacity_offset" "\xff\xff\xff\xff"
 poke_file "$TEST_IMG" "$grain_table_size_offset" "\x01\x00\x00\x00"
 { $QEMU_IO -c "read 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
 
+echo "=== Testing monolithicFlat creation and opening ==="
+echo
+IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
+$QEMU_IMG info $TEST_IMG
+
 # success, all done
 echo "*** done"
 rm -f $seq.full
diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
index 2146a1a..9b064b8 100644
--- a/tests/qemu-iotests/059.out
+++ b/tests/qemu-iotests/059.out
@@ -17,4 +17,11 @@  Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 L1 size too big
 qemu-io: can't open device TEST_DIR/t.vmdk: Could not open 'TEST_DIR/t.vmdk': Wrong medium type
 no file open, try 'help open'
+=== Testing monolithicFlat creation and opening ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
+image: /home/fam/qemu/tests/qemu-iotests/scratch/t.vmdk
+file format: vmdk
+virtual size: 64M (67108864 bytes)
+disk size: 4.0K
 *** done