[Qemu-devel] [PATCH] qemu-iotests: fix 030 for faster machines

[Fam Zheng]

If the block job completes too fast, the test can fail. Change the
numbers so the qmp events are more stably captured by the script.

A sleep is removed for the same reason.

Signed-off-by: Fam Zheng <address@hidden>
---
 tests/qemu-iotests/030 | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index ae56f3b..188b182 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -403,14 +403,13 @@ class TestStreamStop(iotests.QMPTestCase):
         result = self.vm.qmp('block-stream', device='drive0')
         self.assert_qmp(result, 'return', {})
 
-        time.sleep(0.1)
         events = self.vm.get_qmp_events(wait=False)
         self.assertEqual(events, [], 'unexpected QMP event: %s' % events)
 
         self.cancel_and_wait()
 
 class TestSetSpeed(iotests.QMPTestCase):
-    image_len = 80 * 1024 * 1024 # MB
+    image_len = 512 * 1024 * 1024 # MB
 
     def setUp(self):
         qemu_img('create', backing_img, str(TestSetSpeed.image_len))
@@ -457,23 +456,23 @@ class TestSetSpeed(iotests.QMPTestCase):
         self.assert_qmp(result, 'return[0]/device', 'drive0')
         self.assert_qmp(result, 'return[0]/speed', 0)
 
-        result = self.vm.qmp('block-job-set-speed', device='drive0', speed=8 * 
1024 * 1024)
+        result = self.vm.qmp('block-job-set-speed', device='drive0', speed=8 * 
1024)
         self.assert_qmp(result, 'return', {})
 
         # Ensure the speed we set was accepted
         result = self.vm.qmp('query-block-jobs')
         self.assert_qmp(result, 'return[0]/device', 'drive0')
-        self.assert_qmp(result, 'return[0]/speed', 8 * 1024 * 1024)
+        self.assert_qmp(result, 'return[0]/speed', 8 * 1024)
 
         self.cancel_and_wait()
 
         # Check setting speed in block-stream works
-        result = self.vm.qmp('block-stream', device='drive0', speed=4 * 1024 * 
1024)
+        result = self.vm.qmp('block-stream', device='drive0', speed=4 * 1024)
         self.assert_qmp(result, 'return', {})
 
         result = self.vm.qmp('query-block-jobs')
         self.assert_qmp(result, 'return[0]/device', 'drive0')
-        self.assert_qmp(result, 'return[0]/speed', 4 * 1024 * 1024)
+        self.assert_qmp(result, 'return[0]/speed', 4 * 1024)
 
         self.cancel_and_wait()
 
-- 
1.8.3.1