RetriableHttp to sleep between retries

infra_libs/test/httplib2_utils_test.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import socket
 import time
 import unittest
 
 import infra_libs
@@ skipping 144 matching lines @@
 
   def test_delegate_set_attr(self):
     """RetriableHttp should delegate setting attributes to Http"""
     self.http.ignore_etag = False
     self.assertFalse(self.http.ignore_etag)
     self.assertFalse(self.http._http.ignore_etag)
     self.http.ignore_etag = True
     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,
       (httplib2.Response({'status': 200}), 'content')
     ])
     response, _ = self.http.request('http://foo/')
     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/')
     self.assertEqual(500, response.status)
     self.http._http.request.assert_has_calls([ self._MOCK_REQUEST ] * 5)
 
 
 class InstrumentedHttplib2Test(unittest.TestCase):
   def setUp(self):
     super(InstrumentedHttplib2Test, self).setUp()
@@ skipping 153 matching lines @@
                                 ('.*', {'status': 404}, '')])
     response, body = http.request('https://mywebserver.woo.hoo', 'GET')
     self.assertIsInstance(response, httplib2.Response)
     self.assertEqual(response.status, 404)
     self.assertEqual(body, '')
 
     self.assertEqual(http.requests_made[0].uri, 'https://mywebserver.woo.hoo')
     self.assertEqual(http.requests_made[0].method, 'GET')
     self.assertEqual(http.requests_made[0].body, None)
     self.assertEqual(http.requests_made[0].headers, None)