Add HttpsMonitor

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 111 matching lines @@
     self.assertIsInstance(http, infra_libs.InstrumentedHttp)
 
   # Only test one malformed case and rely on LoadJsonCredentialsTest
   # for the other cases.
   def test_malformed_credentials(self):
     with self.assertRaises(infra_libs.AuthError):
       infra_libs.get_authenticated_http(
         'creds_malformed.json',
         service_accounts_creds_root=DATA_DIR)
 
+class RetryableHttplib2Test(unittest.TestCase):
+  def setUp(self):
+    super(RetryableHttplib2Test, self).setUp()
+    self.http = infra_libs.RetryableHttp(httplib2.Http(), max_tries=5,
+                                         retrying_statuses=[500])
+    self.http.http_obj.request = mock.Mock()

[Sergey Berezin, 2016/07/06 20:13:29]

Please try to use mock.create_autospec(..., spec_set=True), if possible. It will
catch otherwise silent errors e.g. in 
  my_mock.assert_haZ_calls(...)

Alternatively, use

 self.assertEqual(my_mock.mock_calls, [<call list>]).

This equally guards from the above pitfall, but wouldn't check the call
signature.

[tnn, 2016/07/06 22:05:18]

Done.

+
+  def test_succeed(self):
+    self.http.http_obj.request.return_value = (
+        httplib2.Response({'status': 400}), 'content')
+    response, _ = self.http.request('http://foo/')
+    self.assertEqual(400, response.status)
+    self.http.http_obj.request.assert_called_once_with('http://foo/',
+                                                       'GET', None)
+
+  def test_retry_succeed(self):
+    self.http.http_obj.request.side_effect = [
+      (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_obj.request.assert_has_calls(
+        [ mock.call('http://foo/', 'GET', None) ] * 3)
+
+  def test_fail_exception(self):
+    self.http.http_obj.request.side_effect = httplib2.HttpLib2Error
+    self.assertRaises(httplib2.HttpLib2Error, self.http.request, 'http://foo/')
+    self.http.http_obj.request.assert_has_calls(
+        [ mock.call('http://foo/', 'GET', None) ] * 5)
+
+  def test_fail_status_code(self):
+    self.http.http_obj.request.return_value = (
+        httplib2.Response({'status': 500}), 'content')
+    response, _ = self.http.request('http://foo/')
+    self.assertEqual(500, response.status)
+    self.http.http_obj.request.assert_has_calls(
+        [ mock.call('http://foo/', 'GET', None) ] * 5)
+
 
 class InstrumentedHttplib2Test(unittest.TestCase):
   def setUp(self):
     super(InstrumentedHttplib2Test, self).setUp()
     self.mock_time = mock.create_autospec(time.time, spec_set=True)
     self.mock_time.return_value = 42
     self.http = infra_libs.InstrumentedHttp('test', time_fn=self.mock_time)
     self.http._request = mock.Mock()
     ts_mon.reset_for_unittest()
 
@@ skipping 147 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)