[Abandoned] Move url_open with dependencies to utils.net module.

tests/run_isolated_test.py

Index: tests/run_isolated_test.py
diff --git a/tests/run_isolated_test.py b/tests/run_isolated_test.py
index 04a699bdaa026204e6d10310a3fda52d01bc9f97..197096e892c7938b488a929e1722c9343badb7e8 100755
--- a/tests/run_isolated_test.py
+++ b/tests/run_isolated_test.py
@@ -5,15 +5,12 @@
 
 import json
 import logging
-import math
 import os
 import shutil
-import StringIO
 import sys
 import tempfile
 import time
 import unittest
-import urllib2
 
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, ROOT_DIR)
@@ -21,8 +18,7 @@ sys.path.insert(0, ROOT_DIR)
 import auto_stub
 import run_isolated
 
-# Number of times self._now() is called per loop in HttpService._retry_loop().
-NOW_CALLS_PER_OPEN = 2
+from utils import net
 
 
 class RemoteTest(run_isolated.Remote):
@@ -35,13 +31,6 @@ class RemoteTest(run_isolated.Remote):
     return upload_file
 
 
-def fake_http_response(content, url):
-  """Returns run_isolated.HttpResponse with predefined content."""
-  stream = StringIO.StringIO(content)
-  stream.headers = {'content-length': len(content)}
-  return run_isolated.HttpResponse(stream, url)
-
-
 class RunIsolatedTest(auto_stub.TestCase):
   def setUp(self):
     super(RunIsolatedTest, self).setUp()
@@ -137,8 +126,8 @@ class RunIsolatedTest(auto_stub.TestCase):
     self.assertEqual([], remote.join())
 
   def test_zip_header_error(self):
-    self.mock(run_isolated, 'url_open',
-              lambda url, **_kwargs: fake_http_response('111', url))
+    self.mock(run_isolated.net, 'url_open',
+        lambda url, **_kwargs: net.HttpResponse.get_fake_response('111', url))
     self.mock(run_isolated.time, 'sleep', lambda _x: None)
 
     remote = run_isolated.Remote('https://fake-CAD.com/')
@@ -154,256 +143,6 @@ class RunIsolatedTest(auto_stub.TestCase):
     self.assertEqual([], remote.join())
 
 
-
-class HttpServiceTest(auto_stub.TestCase):
-
-  # HttpService that doesn't sleep in retries and doesn't write cookie files.
-  class HttpServiceNoSideEffects(run_isolated.HttpService):
-    def __init__(self, *args, **kwargs):
-      super(HttpServiceTest.HttpServiceNoSideEffects, self).__init__(
-          *args, **kwargs)
-      self.sleeps = []
-      self._count = 0.
-
-    def _now(self):  # pylint: disable=W0221
-      x = self._count
-      self._count += 1
-      return x
-
-    def sleep_before_retry(self, attempt, max_wait):
-      self.sleeps.append((attempt, max_wait))
-
-    def load_cookie_jar(self):  # pylint: disable=W0221
-      pass
-
-    def save_cookie_jar(self):  # pylint: disable=W0221
-      pass
-
-  def mocked_http_service(self, url='http://example.com', **kwargs):
-    service = HttpServiceTest.HttpServiceNoSideEffects(url)
-    for name, fn in kwargs.iteritems():
-      self.assertTrue(getattr(service, name))
-      setattr(service, name, fn)
-    return service
-
-  def test_request_GET_success(self):
-    service_url = 'http://example.com'
-    request_url = '/some_request'
-    response = 'True'
-
-    def mock_url_open(request, **_kwargs):
-      self.assertTrue(request.get_full_url().startswith(service_url +
-                                                        request_url))
-      return StringIO.StringIO(response)
-
-    service = self.mocked_http_service(url=service_url, _url_open=mock_url_open)
-    self.assertEqual(service.request(request_url).read(), response)
-    self.assertEqual([], service.sleeps)
-
-  def test_request_POST_success(self):
-    service_url = 'http://example.com'
-    request_url = '/some_request'
-    response = 'True'
-
-    def mock_url_open(request, **_kwargs):
-      self.assertTrue(request.get_full_url().startswith(service_url +
-                                                        request_url))
-      self.assertEqual('', request.get_data())
-      return StringIO.StringIO(response)
-
-    service = self.mocked_http_service(url=service_url, _url_open=mock_url_open)
-    self.assertEqual(service.request(request_url, data={}).read(), response)
-    self.assertEqual([], service.sleeps)
-
-  def test_request_success_after_failure(self):
-    response = 'True'
-
-    def mock_url_open(request, **_kwargs):
-      if run_isolated.COUNT_KEY + '=1' not in request.get_data():
-        raise urllib2.URLError('url')
-      return StringIO.StringIO(response)
-
-    service = self.mocked_http_service(_url_open=mock_url_open)
-    self.assertEqual(service.request('/', data={}).read(), response)
-    self.assertEqual(
-        [(0, run_isolated.URL_OPEN_TIMEOUT - NOW_CALLS_PER_OPEN)],
-        service.sleeps)
-
-  def test_request_failure_max_attempts_default(self):
-    def mock_url_open(_request, **_kwargs):
-      raise urllib2.URLError('url')
-    service = self.mocked_http_service(_url_open=mock_url_open)
-    self.assertEqual(service.request('/'), None)
-    retries = [
-      (i, run_isolated.URL_OPEN_TIMEOUT - NOW_CALLS_PER_OPEN * (i + 1))
-      for i in xrange(run_isolated.URL_OPEN_MAX_ATTEMPTS)
-    ]
-    self.assertEqual(retries, service.sleeps)
-
-  def test_request_failure_max_attempts(self):
-    def mock_url_open(_request, **_kwargs):
-      raise urllib2.URLError('url')
-    service = self.mocked_http_service(_url_open=mock_url_open)
-    self.assertEqual(service.request('/', max_attempts=23), None)
-    retries = [
-      (i, run_isolated.URL_OPEN_TIMEOUT - NOW_CALLS_PER_OPEN * (i + 1))
-      for i in xrange(23)
-    ]
-    self.assertEqual(retries, service.sleeps)
-
-  def test_request_failure_timeout(self):
-    def mock_url_open(_request, **_kwargs):
-      raise urllib2.URLError('url')
-    service = self.mocked_http_service(_url_open=mock_url_open)
-    self.assertEqual(service.request('/', max_attempts=10000), None)
-    retries = [
-      (i, run_isolated.URL_OPEN_TIMEOUT - NOW_CALLS_PER_OPEN * (i + 1))
-      # Currently 179 for timeout == 360.
-      for i in xrange(
-          int(run_isolated.URL_OPEN_TIMEOUT) / NOW_CALLS_PER_OPEN - 1)
-    ]
-    self.assertEqual(retries, service.sleeps)
-
-  def test_request_failure_timeout_default(self):
-    def mock_url_open(_request, **_kwargs):
-      raise urllib2.URLError('url')
-    service = self.mocked_http_service(_url_open=mock_url_open)
-    self.assertEqual(service.request('/', timeout=10.), None)
-    retries = [(i, 8. - (NOW_CALLS_PER_OPEN * i)) for i in xrange(4)]
-    self.assertEqual(retries, service.sleeps)
-
-  def test_request_HTTP_error_no_retry(self):
-    count = []
-    def mock_url_open(request, **_kwargs):
-      count.append(request)
-      raise urllib2.HTTPError(
-          'url', 400, 'error message', None, StringIO.StringIO())
-
-    service = self.mocked_http_service(_url_open=mock_url_open)
-    self.assertEqual(service.request('/', data={}), None)
-    self.assertEqual(1, len(count))
-    self.assertEqual([], service.sleeps)
-
-  def test_request_HTTP_error_retry_404(self):
-    response = 'data'
-    def mock_url_open(request, **_kwargs):
-      if run_isolated.COUNT_KEY + '=1' in request.get_data():
-        return StringIO.StringIO(response)
-      raise urllib2.HTTPError(
-          'url', 404, 'error message', None, StringIO.StringIO())
-
-    service = self.mocked_http_service(_url_open=mock_url_open)
-    result = service.request('/', data={}, retry_404=True)
-    self.assertEqual(result.read(), response)
-    self.assertEqual(
-        [(0, run_isolated.URL_OPEN_TIMEOUT - NOW_CALLS_PER_OPEN)],
-        service.sleeps)
-
-  def test_request_HTTP_error_with_retry(self):
-    response = 'response'
-
-    def mock_url_open(request, **_kwargs):
-      if run_isolated.COUNT_KEY + '=1' not in request.get_data():
-        raise urllib2.HTTPError(
-            'url', 500, 'error message', None, StringIO.StringIO())
-      return StringIO.StringIO(response)
-
-    service = self.mocked_http_service(_url_open=mock_url_open)
-    self.assertTrue(service.request('/', data={}).read(), response)
-    self.assertEqual(
-        [(0, run_isolated.URL_OPEN_TIMEOUT - NOW_CALLS_PER_OPEN)],
-        service.sleeps)
-
-  def test_count_key_in_data_failure(self):
-    data = {run_isolated.COUNT_KEY: 1}
-    service = self.mocked_http_service()
-    self.assertEqual(service.request('/', data=data), None)
-    self.assertEqual([], service.sleeps)
-
-  def test_auth_success(self):
-    count = []
-    response = 'response'
-    def mock_url_open(_request, **_kwargs):
-      if not count:
-        raise urllib2.HTTPError(
-          'url', 403, 'error message', None, StringIO.StringIO())
-      return StringIO.StringIO(response)
-    def mock_authenticate():
-      self.assertEqual(len(count), 0)
-      count.append(1)
-      return True
-    service = self.mocked_http_service(_url_open=mock_url_open,
-                                       authenticate=mock_authenticate)
-    self.assertEqual(service.request('/').read(), response)
-    self.assertEqual(len(count), 1)
-    self.assertEqual([], service.sleeps)
-
-  def test_auth_failure(self):
-    count = []
-    def mock_url_open(_request, **_kwargs):
-      raise urllib2.HTTPError(
-          'url', 403, 'error message', None, StringIO.StringIO())
-    def mock_authenticate():
-      count.append(1)
-      return False
-    service = self.mocked_http_service(_url_open=mock_url_open,
-                                       authenticate=mock_authenticate)
-    self.assertEqual(service.request('/'), None)
-    self.assertEqual(len(count), 1) # single attempt only
-    self.assertEqual([], service.sleeps)
-
-  def test_request_attempted_before_auth(self):
-    calls = []
-    def mock_url_open(_request, **_kwargs):
-      calls.append('url_open')
-      raise urllib2.HTTPError(
-          'url', 403, 'error message', None, StringIO.StringIO())
-    def mock_authenticate():
-      calls.append('authenticate')
-      return False
-    service = self.mocked_http_service(_url_open=mock_url_open,
-                                       authenticate=mock_authenticate)
-    self.assertEqual(service.request('/'), None)
-    self.assertEqual(calls, ['url_open', 'authenticate'])
-    self.assertEqual([], service.sleeps)
-
-  def test_sleep_before_retry(self):
-    # Verifies bounds. Because it's using a pseudo-random number generator and
-    # not a read random source, it's basically guaranteed to never return the
-    # same value twice consecutively.
-    a = run_isolated.HttpService.calculate_sleep_before_retry(0, 0)
-    b = run_isolated.HttpService.calculate_sleep_before_retry(0, 0)
-    self.assertTrue(a >= math.pow(1.5, -1), a)
-    self.assertTrue(b >= math.pow(1.5, -1), b)
-    self.assertTrue(a < 1.5 + math.pow(1.5, -1), a)
-    self.assertTrue(b < 1.5 + math.pow(1.5, -1), b)
-    self.assertNotEqual(a, b)
-
-  def test_url_read(self):
-    # Successfully reads the data.
-    self.mock(run_isolated, 'url_open',
-              lambda url, **_kwargs: fake_http_response('111', url))
-    self.assertEqual(run_isolated.url_read('https://fake_url.com/test'), '111')
-
-    # Respects url_open connection errors.
-    self.mock(run_isolated, 'url_open', lambda _url, **_kwargs: None)
-    self.assertIsNone(run_isolated.url_read('https://fake_url.com/test'))
-
-    # Respects read timeout errors.
-    def timeouting_http_response(url):
-      def read_mock(_size=None):
-        raise run_isolated.TimeoutError()
-      stream = StringIO.StringIO('')
-      stream.headers = {'content-length': 0}
-      response = run_isolated.HttpResponse(stream, url)
-      response.read = read_mock
-      return response
-
-    self.mock(run_isolated, 'url_open',
-              lambda url, **_kwargs: timeouting_http_response(url))
-    self.assertIsNone(run_isolated.url_read('https://fake_url.com/test'))
-
-
 if __name__ == '__main__':
   logging.basicConfig(
       level=(logging.DEBUG if '-v' in sys.argv else logging.FATAL))