From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVXIb-0002J3-1I for qemu-devel@nongnu.org; Wed, 20 Jun 2018 03:13:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVXIZ-0004Lm-SS for qemu-devel@nongnu.org; Wed, 20 Jun 2018 03:13:01 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49572 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fVXIZ-0004Lh-Mu for qemu-devel@nongnu.org; Wed, 20 Jun 2018 03:12:59 -0400 From: Markus Armbruster References: <20180619053426.13065-1-peterx@redhat.com> <20180619053426.13065-5-peterx@redhat.com> <871sd2vpzg.fsf@dusky.pond.sub.org> <20180620030620.GC18985@xz-mi> Date: Wed, 20 Jun 2018 09:12:57 +0200 In-Reply-To: <20180620030620.GC18985@xz-mi> (Peter Xu's message of "Wed, 20 Jun 2018 11:06:20 +0800") Message-ID: <87y3faj5hi.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v4 4/7] tests: iotests: drop some stderr line List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu Cc: Markus Armbruster , Kevin Wolf , Peter Maydell , Thomas Huth , Fam Zheng , Christian Borntraeger , qemu-devel@nongnu.org, Max Reitz , Eric Auger , Stefan Hajnoczi , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , John Snow , "Dr . David Alan Gilbert" Peter Xu writes: > On Tue, Jun 19, 2018 at 03:57:07PM +0200, Markus Armbruster wrote: >> Peter Xu 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. [...]