From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0PfP-00016R-4S for qemu-devel@nongnu.org; Mon, 26 Mar 2018 06:47:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0PfL-0000il-TI for qemu-devel@nongnu.org; Mon, 26 Mar 2018 06:47:55 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:56878 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 1f0PfL-0000i7-PR for qemu-devel@nongnu.org; Mon, 26 Mar 2018 06:47:51 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0385477067 for ; Mon, 26 Mar 2018 10:47:48 +0000 (UTC) Date: Mon, 26 Mar 2018 12:47:39 +0200 From: Kevin Wolf Message-ID: <20180326104739.GC5267@localhost.localdomain> References: <20180326061157.24865-1-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180326061157.24865-1-peterx@redhat.com> Subject: Re: [Qemu-devel] [PATCH] iotests: fix wait_until_completed() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu Cc: qemu-devel@nongnu.org, Max Reitz Am 26.03.2018 um 08:11 hat Peter Xu geschrieben: > If there are more than one events, wait_until_completed() might return > the 2nd event even if the 1st event is JOB_COMPLETED, since the for loop > will continue to run even if completed is set to True. > > It never happened before, but it can be triggered when OOB is enabled > due to the RESUME startup message. Fix that up by removing the boolean > and make sure we return the correct event. > > Signed-off-by: Peter Xu > --- > tests/qemu-iotests/iotests.py | 20 ++++++++------------ > 1 file changed, 8 insertions(+), 12 deletions(-) > > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index b5d7945af8..11704e6583 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -470,18 +470,14 @@ class QMPTestCase(unittest.TestCase): > > def wait_until_completed(self, drive='drive0', check_offset=True): > '''Wait for a block job to finish, returning the event''' > - completed = False > - while not completed: > - for event in self.vm.get_qmp_events(wait=True): > - if event['event'] == 'BLOCK_JOB_COMPLETED': > - self.assert_qmp(event, 'data/device', drive) > - self.assert_qmp_absent(event, 'data/error') > - if check_offset: > - self.assert_qmp(event, 'data/offset', event['data']['len']) > - completed = True > - > - self.assert_no_active_block_jobs() > - return event > + for event in self.vm.get_qmp_events(wait=True): > + if event['event'] == 'BLOCK_JOB_COMPLETED': > + self.assert_qmp(event, 'data/device', drive) > + self.assert_qmp_absent(event, 'data/error') > + if check_offset: > + self.assert_qmp(event, 'data/offset', event['data']['len']) > + self.assert_no_active_block_jobs() > + return event > > def wait_ready(self, drive='drive0'): > '''Wait until a block job BLOCK_JOB_READY event''' If an event is pending, but it's not the expected event, won't we return None now instead of waiting for the BLOCK_JOB_COMPLETED event? Wouldn't it be much easier to just add a 'break'? Kevin