iotests: Replace time.clock() with Timeout
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 <kwolf@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
parent
47c1cc30e4
commit
d8336c6b28
|
@ -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:
|
||||
with iotests.Timeout(3, 'Timeout while waiting for the tray to open'):
|
||||
while not self.has_opened:
|
||||
self.process_events()
|
||||
if not self.has_opened:
|
||||
self.fail('Timeout while waiting for the tray to open')
|
||||
|
||||
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:
|
||||
with iotests.Timeout(3, 'Timeout while waiting for the tray to close'):
|
||||
while not self.has_closed:
|
||||
self.process_events()
|
||||
if not self.has_opened:
|
||||
self.fail('Timeout while waiting for the tray to close')
|
||||
|
||||
class GeneralChangeTestsBaseClass(ChangeBaseClass):
|
||||
|
||||
|
|
Loading…
Reference in a new issue