iotests/059: Fix reference output

[PATCH] iotests/059: Fix reference output

Max Reitz posted 1 patch 3 years, 8 months ago

Download mbox

Test docker-quick@centos7 failed

Test docker-mingw@fedora failed

Test checkpatch failed

Test FreeBSD failed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200811084150.326377-1-mreitz@redhat.com

Maintainers: Max Reitz <mreitz@redhat.com>, Kevin Wolf <kwolf@redhat.com>

tests/qemu-iotests/059.out | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH] iotests/059: Fix reference output

Posted by Max Reitz 3 years, 8 months ago

As of the patch to flush qemu-img's "Formatting" message before the
error message, 059 has been broken for vmdk.  Fix it.

Fixes: 4e2f4418784da09cb106264340241856cd2846df
       ("qemu-img: Flush stdout before before potential stderr messages")
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/059.out | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
index 6d127e28d8..2b83c0c8b6 100644
--- a/tests/qemu-iotests/059.out
+++ b/tests/qemu-iotests/059.out
@@ -19,8 +19,8 @@ file format: IMGFMT
 virtual size: 2 GiB (2147483648 bytes)
 
 === Testing monolithicFlat with zeroed_grain ===
-qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648
+qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain
 
 === Testing big twoGbMaxExtentFlat ===
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000
-- 
2.26.2

Re: [PATCH] iotests/059: Fix reference output

Posted by Eric Blake 3 years, 8 months ago

On 8/11/20 3:41 AM, Max Reitz wrote:
> As of the patch to flush qemu-img's "Formatting" message before the
> error message, 059 has been broken for vmdk.  Fix it.
> 
> Fixes: 4e2f4418784da09cb106264340241856cd2846df
>         ("qemu-img: Flush stdout before before potential stderr messages")
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>   tests/qemu-iotests/059.out | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

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

> 
> diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
> index 6d127e28d8..2b83c0c8b6 100644
> --- a/tests/qemu-iotests/059.out
> +++ b/tests/qemu-iotests/059.out
> @@ -19,8 +19,8 @@ file format: IMGFMT
>   virtual size: 2 GiB (2147483648 bytes)
>   
>   === Testing monolithicFlat with zeroed_grain ===
> -qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain
>   Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648
> +qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain
>   
>   === Testing big twoGbMaxExtentFlat ===
>   Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org