From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVH8Q-0007Hq-Co for qemu-devel@nongnu.org; Tue, 19 Jun 2018 09:57:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVH8N-0004dD-Az for qemu-devel@nongnu.org; Tue, 19 Jun 2018 09:57:26 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34930 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 1fVH8N-0004d1-6T for qemu-devel@nongnu.org; Tue, 19 Jun 2018 09:57:23 -0400 From: Markus Armbruster References: <20180619053426.13065-1-peterx@redhat.com> <20180619053426.13065-5-peterx@redhat.com> Date: Tue, 19 Jun 2018 15:57:07 +0200 In-Reply-To: <20180619053426.13065-5-peterx@redhat.com> (Peter Xu's message of "Tue, 19 Jun 2018 13:34:23 +0800") Message-ID: <871sd2vpzg.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: qemu-devel@nongnu.org, Kevin Wolf , Peter Maydell , Thomas Huth , Fam Zheng , Eric Auger , John Snow , Max Reitz , Christian Borntraeger , "Dr . David Alan Gilbert" , Stefan Hajnoczi , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Markus Armbruster 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. > > The order of the event and the in/out error line is swapped. I didn't > dig up the reason, but AFAIU what we want to verify is the event rather > than stderr. Let's drop the stderr line directly for this test. > > Signed-off-by: Peter Xu