iotests: fix race in 030
PATCH 1/1 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.
--- tests/qemu-iotests/030 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tests/qemu-iotests/030 +4 -1
@@ -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')
Signature · 1 line
2.4.3
Quoted 41 lines · John Snow
the
stop_testcase 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 <[email protected]>--- tests/qemu-iotests/030 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)tests/qemu-iotests/030 +4
-1@@ -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')Signature · 1 line
2.4.3
Quoted 9 lines · John Snow
the
stop_testcase 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 <[email protected]>
Berto
Quoted 26 lines · John Snow
the
stop_testcase 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 <[email protected]>--- tests/qemu-iotests/030 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)tests/qemu-iotests/030 +1
-0@@ -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')
tests/qemu-iotests/030 class TestEIO(TestErrors): · line 261
Quoted 4 lines
tests/qemu-iotests/030 +1
-0@@ -257,9 +258,11 @@ class TestEIO(TestErrors): self.assert_qmp(result, 'return', {}) result = self.vm.qmp('query-block-jobs') + if (result == {'return': []}):
Using parenthisis around if conditions is not native Python but "(scalar)" equals to "scalar", so the statement is still correct. Maybe this could be fixed when applying, or even if it stays as is:
Quoted 12 lines
tests/qemu-iotests/030 +2
-1+ # 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')Signature · 1 line
2.4.3
Kevin Wolf
AppliedAm 11.11.2015 um 21:27 hat John Snow geschrieben:
Quoted 9 lines
the
stop_testcase 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 <[email protected]>
Thanks, applied to the block branch.
Kevin