iotests: Fix another race in 030
PATCH 1/1 iotests: Fix another race in 030
We can't rely on a non-paused job to be present and running for us. Assume that if the job is not present that it completed already.
Signed-off-by John Snow <[email protected]>
--- tests/qemu-iotests/030 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tests/qemu-iotests/030 +4 -1
@@ -547,11 +547,14 @@ 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') result = self.vm.qmp('query-block-jobs') + if result == {'return': []}: + # Job finished too quickly + continue self.assert_qmp(result, 'return[0]/paused', False) - error = True elif event['event'] == 'BLOCK_JOB_COMPLETED': self.assertTrue(error, 'job completed unexpectedly') self.assert_qmp(event, 'data/type', 'stream')
Signature · 1 line
2.9.3
Quoted 32 lines · John Snow
We can't rely on a non-paused job to be present and running for us. Assume that if the job is not present that it completed already.
Signed-off-by John Snow <[email protected]>--- tests/qemu-iotests/030 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)tests/qemu-iotests/030 +4
-1@@ -547,11 +547,14 @@ 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') result = self.vm.qmp('query-block-jobs') + if result == {'return': []}: + # Job finished too quickly + continue self.assert_qmp(result, 'return[0]/paused', False) - error = True elif event['event'] == 'BLOCK_JOB_COMPLETED': self.assertTrue(error, 'job completed unexpectedly') self.assert_qmp(event, 'data/type', 'stream')Signature · 1 line
2.9.3
Looks fine.
Reviewed-by Fam Zheng <[email protected]>
Kevin Wolf
AppliedAm 16.02.2017 um 23:00 hat John Snow geschrieben:
Quoted 4 lines
We can't rely on a non-paused job to be present and running for us. Assume that if the job is not present that it completed already.
Signed-off-by John Snow <[email protected]>
Thanks, applied to the block branch.
Kevin