diff options
author | John Snow <jsnow@redhat.com> | 2015-11-11 15:27:36 -0500 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2015-11-18 15:54:15 +0100 |
commit | 01809194a06d8e6c51c3e69600f14355225f4855 (patch) | |
tree | ea525724828c8274337b6df26aa5ed5828bbf208 | |
parent | a184e74f24f83935c8fc7cd76c06ad0717f89fdb (diff) | |
download | qemu-01809194a06d8e6c51c3e69600f14355225f4855.zip qemu-01809194a06d8e6c51c3e69600f14355225f4855.tar.gz qemu-01809194a06d8e6c51c3e69600f14355225f4855.tar.bz2 |
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 <jsnow@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rwxr-xr-x | tests/qemu-iotests/030 | 5 |
1 files changed, 4 insertions, 1 deletions
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') |