diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2017-07-21 16:41:21 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-07-24 15:06:04 +0200 |
| commit | 2c93c5cb43fd992038711f84ea34c9373273cda6 (patch) | |
| tree | d083c65aab2baf5cbec6462338bd5010e55257ae /tests/qemu-iotests/055 | |
| parent | d3c8c67469ee70fcae116d5abc277a7ebc8a19fd (diff) | |
qemu-iotests: Avoid unnecessary sleeps
Test cases 030, 041 and 055 used to sleep for a second after calling
block-job-pause to make sure that the block job had time to actually
get into paused state. We can instead poll its status and use that one
second only as a timeout.
The tests also slept a second for checking that the block jobs don't
make progress while being paused. Half a second is more than enough for
this.
These changes reduce the total time for the three tests by 25 seconds on
my laptop (from 155 seconds to 130).
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/055')
| -rwxr-xr-x | tests/qemu-iotests/055 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055 index ba4da65c77..e1206caf9b 100755 --- a/tests/qemu-iotests/055 +++ b/tests/qemu-iotests/055 @@ -89,11 +89,12 @@ class TestSingleDrive(iotests.QMPTestCase): self.assert_qmp(result, 'return', {}) self.vm.resume_drive('drive0') - time.sleep(1) + self.pause_job('drive0') + result = self.vm.qmp('query-block-jobs') offset = self.dictpath(result, 'return[0]/offset') - time.sleep(1) + time.sleep(0.5) result = self.vm.qmp('query-block-jobs') self.assert_qmp(result, 'return[0]/offset', offset) @@ -302,11 +303,12 @@ class TestSingleTransaction(iotests.QMPTestCase): self.assert_qmp(result, 'return', {}) self.vm.resume_drive('drive0') - time.sleep(1) + self.pause_job('drive0') + result = self.vm.qmp('query-block-jobs') offset = self.dictpath(result, 'return[0]/offset') - time.sleep(1) + time.sleep(0.5) result = self.vm.qmp('query-block-jobs') self.assert_qmp(result, 'return[0]/offset', offset) @@ -529,11 +531,12 @@ class TestDriveCompression(iotests.QMPTestCase): self.assert_qmp(result, 'return', {}) self.vm.resume_drive('drive0') - time.sleep(1) + self.pause_job('drive0') + result = self.vm.qmp('query-block-jobs') offset = self.dictpath(result, 'return[0]/offset') - time.sleep(1) + time.sleep(0.5) result = self.vm.qmp('query-block-jobs') self.assert_qmp(result, 'return[0]/offset', offset) |