* [PATCH] iotests: Fix expected whitespace for 185
@ 2021-02-02 18:59 Eric Blake
2021-02-02 20:03 ` Vladimir Sementsov-Ogievskiy
0 siblings, 1 reply; 4+ messages in thread
From: Eric Blake @ 2021-02-02 18:59 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, open list:Block layer core, Max Reitz
Commit f93e19fb03b adjusted various iotest whitespace discrepancies,
but missed a test that is not part of default 'make check'.
Signed-off-by: Eric Blake <eblake@redhat.com>
---
tests/qemu-iotests/185.out | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/185.out b/tests/qemu-iotests/185.out
index 9dedc8eacbed..754a64125865 100644
--- a/tests/qemu-iotests/185.out
+++ b/tests/qemu-iotests/185.out
@@ -89,7 +89,7 @@ Formatting 'TEST_DIR/t.qcow2.copy', fmt=qcow2 cluster_size=65536 extended_l2=off
'format': 'IMGFMT',
'sync': 'full',
'speed': 65536,
- 'x-perf': { 'max-chunk': 65536 } } }
+ 'x-perf': {'max-chunk': 65536} } }
Formatting 'TEST_DIR/t.qcow2.copy', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=67108864 lazy_refcounts=off refcount_bits=16
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "disk"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "disk"}}
--
2.30.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] iotests: Fix expected whitespace for 185
2021-02-02 18:59 [PATCH] iotests: Fix expected whitespace for 185 Eric Blake
@ 2021-02-02 20:03 ` Vladimir Sementsov-Ogievskiy
2021-02-02 20:10 ` Philippe Mathieu-Daudé
2021-02-02 20:57 ` Eric Blake
0 siblings, 2 replies; 4+ messages in thread
From: Vladimir Sementsov-Ogievskiy @ 2021-02-02 20:03 UTC (permalink / raw)
To: Eric Blake, qemu-devel; +Cc: Kevin Wolf, open list:Block layer core, Max Reitz
02.02.2021 21:59, Eric Blake wrote:
> Commit f93e19fb03b adjusted various iotest whitespace discrepancies,
> but missed a test that is not part of default 'make check'.
Actually, at point of f93e19fb03b there is no x-perf at all, so it's not a miss in f93e19fb03b...
Let me bisect it...
Hmm, seems, it's wrong since introducing this line in 61623f82153788e
Why was it wrongly added - it's a question.. Looks like something was merged in a meantime, that changed how qmp log looks like.. And original patch was made before that. But I don't want to dig more :)
>
> Signed-off-by: Eric Blake <eblake@redhat.com>
> ---
> tests/qemu-iotests/185.out | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/qemu-iotests/185.out b/tests/qemu-iotests/185.out
> index 9dedc8eacbed..754a64125865 100644
> --- a/tests/qemu-iotests/185.out
> +++ b/tests/qemu-iotests/185.out
> @@ -89,7 +89,7 @@ Formatting 'TEST_DIR/t.qcow2.copy', fmt=qcow2 cluster_size=65536 extended_l2=off
> 'format': 'IMGFMT',
> 'sync': 'full',
> 'speed': 65536,
> - 'x-perf': { 'max-chunk': 65536 } } }
> + 'x-perf': {'max-chunk': 65536} } }
> Formatting 'TEST_DIR/t.qcow2.copy', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=67108864 lazy_refcounts=off refcount_bits=16
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "disk"}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "disk"}}
>
for the patch itself:
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
--
Best regards,
Vladimir
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] iotests: Fix expected whitespace for 185
2021-02-02 20:03 ` Vladimir Sementsov-Ogievskiy
@ 2021-02-02 20:10 ` Philippe Mathieu-Daudé
2021-02-02 20:57 ` Eric Blake
1 sibling, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-02-02 20:10 UTC (permalink / raw)
To: Vladimir Sementsov-Ogievskiy, Eric Blake, qemu-devel
Cc: Kevin Wolf, open list:Block layer core, Max Reitz
On 2/2/21 9:03 PM, Vladimir Sementsov-Ogievskiy wrote:
> 02.02.2021 21:59, Eric Blake wrote:
>> Commit f93e19fb03b adjusted various iotest whitespace discrepancies,
>> but missed a test that is not part of default 'make check'.
>
>
> Actually, at point of f93e19fb03b there is no x-perf at all, so it's not
> a miss in f93e19fb03b...
>
> Let me bisect it...
>
> Hmm, seems, it's wrong since introducing this line in 61623f82153788e
Assuming you'll reword the commit description:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> Why was it wrongly added - it's a question.. Looks like something was
> merged in a meantime, that changed how qmp log looks like.. And original
> patch was made before that. But I don't want to dig more :)
>
>>
>> Signed-off-by: Eric Blake <eblake@redhat.com>
>> ---
>> tests/qemu-iotests/185.out | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tests/qemu-iotests/185.out b/tests/qemu-iotests/185.out
>> index 9dedc8eacbed..754a64125865 100644
>> --- a/tests/qemu-iotests/185.out
>> +++ b/tests/qemu-iotests/185.out
>> @@ -89,7 +89,7 @@ Formatting 'TEST_DIR/t.qcow2.copy', fmt=qcow2
>> cluster_size=65536 extended_l2=off
>> 'format': 'IMGFMT',
>> 'sync': 'full',
>> 'speed': 65536,
>> - 'x-perf': { 'max-chunk': 65536 } } }
>> + 'x-perf': {'max-chunk': 65536} } }
>> Formatting 'TEST_DIR/t.qcow2.copy', fmt=qcow2 cluster_size=65536
>> extended_l2=off compression_type=zlib size=67108864 lazy_refcounts=off
>> refcount_bits=16
>> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
>> "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id":
>> "disk"}}
>> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
>> "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id":
>> "disk"}}
>>
>
>
> for the patch itself:
>
> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] iotests: Fix expected whitespace for 185
2021-02-02 20:03 ` Vladimir Sementsov-Ogievskiy
2021-02-02 20:10 ` Philippe Mathieu-Daudé
@ 2021-02-02 20:57 ` Eric Blake
1 sibling, 0 replies; 4+ messages in thread
From: Eric Blake @ 2021-02-02 20:57 UTC (permalink / raw)
To: Vladimir Sementsov-Ogievskiy, qemu-devel
Cc: Kevin Wolf, open list:Block layer core, Max Reitz
On 2/2/21 2:03 PM, Vladimir Sementsov-Ogievskiy wrote:
> 02.02.2021 21:59, Eric Blake wrote:
>> Commit f93e19fb03b adjusted various iotest whitespace discrepancies,
>> but missed a test that is not part of default 'make check'.
>
>
> Actually, at point of f93e19fb03b there is no x-perf at all, so it's not
> a miss in f93e19fb03b...
>
> Let me bisect it...
>
> Hmm, seems, it's wrong since introducing this line in 61623f82153788e
>
> Why was it wrongly added - it's a question.. Looks like something was
> merged in a meantime, that changed how qmp log looks like.. And original
> patch was made before that. But I don't want to dig more :)
Okay, I'll adjust my commit message; we definitely had a case of patches
crossing one another, reintroducing the problem.
>
> for the patch itself:
>
> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Thanks; I'll include it in my NBD pull request, since I found it while
using iotests for that.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-02 20:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-02 18:59 [PATCH] iotests: Fix expected whitespace for 185 Eric Blake
2021-02-02 20:03 ` Vladimir Sementsov-Ogievskiy
2021-02-02 20:10 ` Philippe Mathieu-Daudé
2021-02-02 20:57 ` Eric Blake
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).