Http mocking switched to use mock.Mock object.

JNRowe · JNRowe · commit 6035cc378454 · 2012-05-16T20:40:04.000+01:00
diff --git a/extra/requirements-test.txt b/extra/requirements-test.txt
@@ -1,3 +1,4 @@
 -r requirements.txt
 coverage>=3.5
+mock>=0.7.1
 nose>=1.1.2
diff --git a/tests/utils.py b/tests/utils.py
@@ -11,6 +11,8 @@
 
 import httplib2
 
+from mock import Mock
+
 from github2.client import Github
 from github2.request import charset_from_headers
 
@@ -19,32 +21,26 @@
     bytes = lambda x, enc: x
 
 
-HTTP_DATA_DIR = "tests/data/"
-
-ORIG_HTTP_OBJECT = httplib2.Http
+ORIG_REQUEST_METHOD = httplib2.Http.request
 
 
-class HttpMock(object):
-    """Simple Http mock that returns saved entries.
+def request_mock(uri, method='GET', body=None, headers=None,
+              redirections=5, connection_type=None):
+    """Http mock side effect that returns saved entries.
 
     Implementation tests should never span network boundaries.
 
     """
 
-    def __init__(self, *args, **kwargs):
-        pass
-
-    def request(self, uri, method='GET', body=None, headers=None,
-                redirections=5, connection_type=None):
-        file = os.path.join(HTTP_DATA_DIR, httplib2.safename(uri))
-        if os.path.exists(file):
-            response = message_from_file(open(file))
-            headers = httplib2.Response(response)
-            body = bytes(response.get_payload(), charset_from_headers(headers))
-            return (headers, body)
-        else:
-            return (httplib2.Response({"status": "404"}),
-                    "Resource %r unavailable from test data store" % file)
+    file = os.path.join("tests/data", httplib2.safename(uri))
+    if os.path.exists(file):
+        response = message_from_file(open(file))
+        headers = httplib2.Response(response)
+        body = bytes(response.get_payload(), charset_from_headers(headers))
+        return (headers, body)
+    else:
+        return (httplib2.Response({"status": "404"}),
+                "Resource %r unavailable from test data store" % file)
 
 
 class HttpMockTestCase(unittest.TestCase):
@@ -58,7 +54,8 @@ def setUp(self):
         in tests.
 
         """
-        httplib2.Http = HttpMock
+        httplib2.Http.request = Mock(spec_set=httplib2.Http.request,
+                                     side_effect=request_mock)
         self.client = Github()
 
     def tearDown(self):
@@ -67,7 +64,7 @@ def tearDown(self):
         `httplib2.Http` is returned to its original state.
 
         """
-        httplib2.Http = ORIG_HTTP_OBJECT
+        httplib2.Http.request = ORIG_REQUEST_METHOD
 
 
 class HttpMockAuthenticatedTestCase(HttpMockTestCase):
@@ -80,21 +77,6 @@ def setUp(self):
         in tests.
 
         """
-        httplib2.Http = HttpMock
+        httplib2.Http.request = Mock(spec_set=httplib2.Http.request,
+                                     side_effect=request_mock)
         self.client = Github(access_token='xxx')
-
-
-def set_http_mock():
-    """Function to enable ``Http`` mock
-
-    This is useful in simple `nose`-compliant test functions
-    """
-    httplib2.Http = HttpMock
-
-
-def unset_http_mock():
-    """Function to disable ``Http`` mock
-
-    :see: :func:`set_http_mock`
-    """
-    httplib2.Http = ORIG_HTTP_OBJECT
