On Wed, Jun 20, 2018 at 09:12:57AM +0200, Markus Armbruster wrote:
> Peter Xu <pet...@redhat.com> writes:
>
> > On Tue, Jun 19, 2018 at 03:57:07PM +0200, Markus Armbruster wrote:
> >> Peter Xu <pet...@redhat.com> writes:
> >>
> >> > In my Out-Of-Band test, "check -qcow2 060" fail with this (the output is
> >> > manually changed due to line width requirement):
> >> >
> >> > 060 5s ... - output mismatch (see 060.out.bad)
> >> > --- /home/peterx/git/qemu/tests/qemu-iotests/060.out
> >> > +++ /home/peterx/git/qemu/bin/tests/qemu-iotests/060.out.bad
> >> > @@ -427,8 +427,8 @@
> >> > QMP_VERSION
> >> > {"return": {}}
> >> > qcow2: Image is corrupt: L2 table offset 0x2a2a2a00 unaligned (L1
> >> > index: 0); further non-fatal corruption events will be suppressed
> >> > -{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> >> > - "event": "BLOCK_IMAGE_CORRUPTED", "data": {"device": "", "msg": "L2
> >> > - table offset 0x2a2a2a0
> >> > 0 unaligned (L1 index: 0)", "node-name": "drive", "fatal": false}}
> >> > read failed: Input/output error
> >> > +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> >> > + "event": "BLOCK_IMAGE_CORRUPTED", "data": {"device": "", "msg": "L2
> >> > + table offset 0x2a2a2a0
> >> > 0 unaligned (L1 index: 0)", "node-name": "drive", "fatal": false}}
> >> > {"return": ""}
> >> > {"return": {}}
> >> > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> >> > "event": "SHUTDOWN", "data": {"guest": false}}
> >>
> >> Please indent this diff; I'd expect git-am to choke on it.
> >
> > Do you mean something like pretty-JSON?
>
> Instead of
>
> In my Out-Of-Band test, "check -qcow2 060" fail with this (the output is
> manually changed due to line width requirement):
>
> 060 5s ... - output mismatch (see 060.out.bad)
> --- /home/peterx/git/qemu/tests/qemu-iotests/060.out
> +++ /home/peterx/git/qemu/bin/tests/qemu-iotests/060.out.bad
> @@ -427,8 +427,8 @@
> QMP_VERSION
> {"return": {}}
>
> write
>
> In my Out-Of-Band test, "check -qcow2 060" fail with this (the output is
> manually changed due to line width requirement):
>
> 060 5s ... - output mismatch (see 060.out.bad)
> --- /home/peterx/git/qemu/tests/qemu-iotests/060.out
> +++ /home/peterx/git/qemu/bin/tests/qemu-iotests/060.out.bad
> @@ -427,8 +427,8 @@
> QMP_VERSION
> {"return": {}}
>
> The former confuses git-am.
>
> In other words, quote diff output verbatim, but indent your quote.
>
> > How about I remove this chunk too? What do you prefer?
>
> I rather like having the test failure details in the commit message.
Ah I see. I'll keep them then.
Thanks,
--
Peter Xu
