RetriableHttp to sleep between retries

infra_libs/test/httplib2_utils_test.py

Index: infra_libs/test/httplib2_utils_test.py
diff --git a/infra_libs/test/httplib2_utils_test.py b/infra_libs/test/httplib2_utils_test.py
index 9e32bc40402c1e5aefd8d29b9d574af3ab0b3acf..21d57354cdffbf5374a612a83877d6bbecc01689 100644
--- a/infra_libs/test/httplib2_utils_test.py
+++ b/infra_libs/test/httplib2_utils_test.py
@@ -162,14 +162,16 @@ class RetriableHttplib2Test(unittest.TestCase):
     self.assertTrue(self.http.ignore_etag)
     self.assertTrue(self.http._http.ignore_etag)
 
-  def test_succeed(self):
+  @mock.patch('time.sleep', autospec=True)

[Sergey Berezin, 2016/07/14 21:10:17]

nit: in this case it's likely not as relevant, but we often mock time functions
by passing them as an extra parameter. E.g.:

class RetriableHttp()
  def __init__(self, ..., sleep=time.sleep): ...

and in the test:

  self.http = infra_libs.RetriableHttp(..., sleep=mock.Mock(...))

This way, if some other random function actually depends on time, we don't
deadlock mysteriously.

+  def test_succeed(self, _sleep):
     self.http._http.request.return_value = (
         httplib2.Response({'status': 400}), 'content')
     response, _ = self.http.request('http://foo/')
     self.assertEqual(400, response.status)
     self.http._http.request.assert_has_calls([ self._MOCK_REQUEST ])
 
-  def test_retry_succeed(self):
+  @mock.patch('time.sleep', autospec=True)
+  def test_retry_succeed(self, _sleep):
     self.http._http.request.side_effect = iter([
       (httplib2.Response({'status': 500}), 'content'),
       httplib2.HttpLib2Error,
@@ -179,12 +181,14 @@ class RetriableHttplib2Test(unittest.TestCase):
     self.assertEqual(200, response.status)
     self.http._http.request.assert_has_calls([ self._MOCK_REQUEST ] * 3)
 
-  def test_fail_exception(self):
+  @mock.patch('time.sleep', autospec=True)
+  def test_fail_exception(self, _sleep):
     self.http._http.request.side_effect = httplib2.HttpLib2Error()
     self.assertRaises(httplib2.HttpLib2Error, self.http.request, 'http://foo/')
     self.http._http.request.assert_has_calls([ self._MOCK_REQUEST ] * 5)
 
-  def test_fail_status_code(self):
+  @mock.patch('time.sleep', autospec=True)
+  def test_fail_status_code(self, _sleep):
     self.http._http.request.return_value = (
         httplib2.Response({'status': 500}), 'content')
     response, _ = self.http.request('http://foo/')