From b3de4ca481c6b5fd6f9df178270473fd8efb97c1 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 10 Mar 2014 11:15:54 +0100 Subject: [PATCH] [IMP] readability of phantomjs timeouts bzr revid: xmo@openerp.com-20140310101554-6imrb3hnd95q1wgu --- openerp/tests/common.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openerp/tests/common.py b/openerp/tests/common.py index 75207841454..4dcd2938ffe 100644 --- a/openerp/tests/common.py +++ b/openerp/tests/common.py @@ -16,6 +16,8 @@ import unittest2 import urllib2 import xmlrpclib +from datetime import datetime, timedelta + import openerp _logger = logging.getLogger(__name__) @@ -194,11 +196,12 @@ class HttpCase(TransactionCase): Other lines are relayed to the test log. """ - t0 = time.time() + t0 = datetime.now() + td = timedelta(seconds=timeout) buf = bytearray() while True: # timeout - self.assertLess(time.time(), t0 + timeout, + self.assertLess(datetime.now() - t0, td, "PhantomJS tests should take less than %s seconds" % timeout) # read a byte