[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/13] iotests: Replace time.clock() with Timeout
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 01/13] iotests: Replace time.clock() with Timeout |
Date: |
Thu, 22 Nov 2018 17:54:05 +0100 |
time.clock() is deprecated since Python 3.3. Current Python versions
warn that the function will be removed in Python 3.8, and those warnings
make the test case 118 fail.
Replace it with the Timeout mechanism that is compatible with both
Python 2 and 3, and makes the code even a little nicer.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/qemu-iotests/118 | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
index ff3b2ae3e7..c4f4c213ca 100755
--- a/tests/qemu-iotests/118
+++ b/tests/qemu-iotests/118
@@ -53,21 +53,17 @@ class ChangeBaseClass(iotests.QMPTestCase):
if not self.has_real_tray:
return
- timeout = time.clock() + 3
- while not self.has_opened and time.clock() < timeout:
- self.process_events()
- if not self.has_opened:
- self.fail('Timeout while waiting for the tray to open')
+ with iotests.Timeout(3, 'Timeout while waiting for the tray to open'):
+ while not self.has_opened:
+ self.process_events()
def wait_for_close(self):
if not self.has_real_tray:
return
- timeout = time.clock() + 3
- while not self.has_closed and time.clock() < timeout:
- self.process_events()
- if not self.has_opened:
- self.fail('Timeout while waiting for the tray to close')
+ with iotests.Timeout(3, 'Timeout while waiting for the tray to close'):
+ while not self.has_closed:
+ self.process_events()
class GeneralChangeTestsBaseClass(ChangeBaseClass):
--
2.19.1
- [Qemu-devel] [PULL 00/13] Block layer patches, Kevin Wolf, 2018/11/22
- [Qemu-devel] [PULL 02/13] iotests: Replace assertEquals() with assertEqual(), Kevin Wolf, 2018/11/22
- [Qemu-devel] [PULL 03/13] iotests: Skip 233 if certtool not installed, Kevin Wolf, 2018/11/22
- [Qemu-devel] [PULL 04/13] qemu-img: Fix typo, Kevin Wolf, 2018/11/22
- [Qemu-devel] [PULL 01/13] iotests: Replace time.clock() with Timeout,
Kevin Wolf <=
- [Qemu-devel] [PULL 05/13] qemu-img: Fix leak, Kevin Wolf, 2018/11/22
- [Qemu-devel] [PULL 07/13] block: Fix update of BDRV_O_AUTO_RDONLY in update_flags_from_options(), Kevin Wolf, 2018/11/22
- [Qemu-devel] [PULL 06/13] scsi-disk: Fix crash if underlying host file or disk returns error, Kevin Wolf, 2018/11/22
- [Qemu-devel] [PULL 08/13] iotests: fix nbd test 233 to work correctly with raw images, Kevin Wolf, 2018/11/22
- [Qemu-devel] [PULL 09/13] nvme: call blk_drain in NVMe reset code to avoid lockups, Kevin Wolf, 2018/11/22
- [Qemu-devel] [PULL 11/13] Revert "nvme: fix oob access issue(CVE-2018-16847)", Kevin Wolf, 2018/11/22
- [Qemu-devel] [PULL 10/13] nvme: fix out-of-bounds access to the CMB, Kevin Wolf, 2018/11/22
- [Qemu-devel] [PULL 12/13] nvme: fix bug with PCI IRQ pins on teardown, Kevin Wolf, 2018/11/22
- [Qemu-devel] [PULL 13/13] iotests: Enhance 223 to cover multiple bitmap granularities, Kevin Wolf, 2018/11/22
- Re: [Qemu-devel] [PULL 00/13] Block layer patches, Peter Maydell, 2018/11/22