Skip to contentSkip to conversation

iotests: Fix another race in 030

PATCH Applied John Snow 3 participants 3 messages Feb 16, 2017 – Feb 22, 2017

lore
Share & tools
lore

John Snow

author
#0 lore raw

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.

---
 tests/qemu-iotests/030 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tests/qemu-iotests/030 +4 -1
index 54db54a..0d472d5 100755
@@ -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
Reviewed-by on v1 1/1
#1 lore raw
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.

---
 tests/qemu-iotests/030 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tests/qemu-iotests/030 +4 -1
index 54db54a..0d472d5 100755
@@ -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.

Applied
#2 lore raw
In reply to John Snow

Am 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.

Thanks, applied to the block branch.

Kevin