Skip to content
Snippets Groups Projects
Commit 0fa5603c authored by Valentin Lorentz's avatar Valentin Lorentz
Browse files

Fix tests for Python 3.2.

parent 93a8d25a
No related branches found
No related tags found
No related merge requests found
import sys
import time import time
from ppp_libmodule.tests import PPPTestCase from ppp_libmodule.tests import PPPTestCase
...@@ -48,7 +49,7 @@ class HttpTest(PPPTestCase(app)): ...@@ -48,7 +49,7 @@ class HttpTest(PPPTestCase(app)):
self.assertResponse(q, [Response('en', R('bar'), {}, self.assertResponse(q, [Response('en', R('bar'), {},
[TraceItem('test', R('bar'), {})])]) [TraceItem('test', R('bar'), {})])])
def testTimes(self): def _get_test_times_trace_item(self):
t = T(M(), M(), M()) t = T(M(), M(), M())
q = {'id': '1', 'language': 'en', 'tree': t.as_dict(), q = {'id': '1', 'language': 'en', 'tree': t.as_dict(),
'measures': {}, 'trace': []} 'measures': {}, 'trace': []}
...@@ -56,11 +57,25 @@ class HttpTest(PPPTestCase(app)): ...@@ -56,11 +57,25 @@ class HttpTest(PPPTestCase(app)):
self.assertEqual(len(responses), 1, responses) self.assertEqual(len(responses), 1, responses)
response = responses[0] response = responses[0]
self.assertEqual(len(response.trace), 1, response.trace) self.assertEqual(len(response.trace), 1, response.trace)
trace_item = response.trace[0] return response.trace[0]
self.assertEqual(set(trace_item.times), {'start', 'end', 'cpu'})
self.assertGreater(trace_item.times['cpu'], 0.) if sys.version_info >= (3, 3):
# The following may fail on a very slow system. def testTimes(self):
self.assertLess(trace_item.times['cpu'], 1.) trace_item = self._get_test_times_trace_item()
self.assertAlmostEqual(trace_item.times['start'], time.time(), delta=1.)
self.assertAlmostEqual(trace_item.times['end'], time.time(), delta=1.) self.assertEqual(set(trace_item.times), {'start', 'end', 'cpu'})
self.assertGreater(trace_item.times['cpu'], 0.)
# The following may fail on a very slow system.
self.assertLess(trace_item.times['cpu'], 1.)
self.assertAlmostEqual(trace_item.times['start'], time.time(), delta=1.)
self.assertAlmostEqual(trace_item.times['end'], time.time(), delta=1.)
else:
def testTimes(self):
trace_item = self._get_test_times_trace_item()
self.assertEqual(set(trace_item.times), {'start', 'end'})
# The following may fail on a very slow system.
self.assertAlmostEqual(trace_item.times['start'], time.time(), delta=1.)
self.assertAlmostEqual(trace_item.times['end'], time.time(), delta=1.)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment