From: John Snow Date: Wed, 11 Nov 2015 20:27:36 +0000 (-0500) Subject: iotests: fix race in 030 X-Git-Tag: TizenStudio_2.0_p2.3.2~120^2~1^2~52^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01809194a06d8e6c51c3e69600f14355225f4855;p=sdk%2Femulator%2Fqemu.git iotests: fix race in 030 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 Reviewed-by: Fam Zheng Reviewed-by: Alberto Garcia Reviewed-by: Jeff Cody Signed-off-by: Kevin Wolf --- diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index 952a524..32469ef 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')