From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55648)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1Zwc6F-00010V-NU
	for qemu-devel@nongnu.org; Wed, 11 Nov 2015 15:34:36 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1Zwc6E-0002Qa-9q
	for qemu-devel@nongnu.org; Wed, 11 Nov 2015 15:34:35 -0500
Date: Wed, 11 Nov 2015 15:34:27 -0500
From: Jeff Cody <jcody@redhat.com>
Message-ID: <20151111203427.GE2628@localhost.localdomain>
References: <1447273656-1748-1-git-send-email-jsnow@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1447273656-1748-1-git-send-email-jsnow@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] iotests: fix race in 030
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: John Snow <jsnow@redhat.com>
Cc: kwolf@redhat.com, qemu-devel@nongnu.org, qemu-block@nongnu.org

On Wed, Nov 11, 2015 at 03:27:36PM -0500, John Snow wrote:
> the stop_test case tests that we can resume a block-stream
> command after it has stopped/paused due to error. We cannot
> always reliably query it before it finishes after resume, though,
> so make this a conditional.
> 
> The important thing is that we are still testing that it has stopped,
> and that it finishes successfully after we send a resume command.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  tests/qemu-iotests/030 | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
> index 952a524..fd0d186 100755
> --- a/tests/qemu-iotests/030
> +++ b/tests/qemu-iotests/030
> @@ -245,6 +245,7 @@ class TestEIO(TestErrors):
>          while not completed:
>              for event in self.vm.get_qmp_events(wait=True):
>                  if event['event'] == 'BLOCK_JOB_ERROR':
> +                    error = True
>                      self.assert_qmp(event, 'data/device', 'drive0')
>                      self.assert_qmp(event, 'data/operation', 'read')
>  
> @@ -257,9 +258,11 @@ class TestEIO(TestErrors):
>                      self.assert_qmp(result, 'return', {})
>  
>                      result = self.vm.qmp('query-block-jobs')
> +                    if (result == {'return': []}):
> +                        # Race; likely already finished. Check.
> +                        continue
>                      self.assert_qmp(result, 'return[0]/paused', False)
>                      self.assert_qmp(result, 'return[0]/io-status', 'ok')
> -                    error = True
>                  elif event['event'] == 'BLOCK_JOB_COMPLETED':
>                      self.assertTrue(error, 'job completed unexpectedly')
>                      self.assert_qmp(event, 'data/type', 'stream')
> -- 
> 2.4.3
> 

Reviewed-by: Jeff Cody <jcody@redhat.com>