Update references to mock in tests/unit/

sigmavirus24 · sigmavirus24 · commit c8643201a0bf · 2014-05-04T14:02:46.000-05:00
diff --git a/tests/unit/test_github_session.py b/tests/unit/test_github_session.py
@@ -3,10 +3,7 @@
 import requests
 
 from github3 import session
-try:
-   from unittest.mock import patch, Mock
-except ImportError:
-   from mock import patch, Mock
+from .helper import mock
 
 
 class TestGitHubSession:
@@ -87,7 +84,7 @@ def test_basic_login_disables_token_auth(self):
         s.basic_auth('username', 'password')
         assert 'Authorization' not in s.headers
 
-    @patch.object(requests.Session, 'request')
+    @mock.patch.object(requests.Session, 'request')
     def test_handle_two_factor_auth(self, request_mock):
         """Test the method that handles getting the 2fa code"""
         s = self.build_session()
@@ -99,11 +96,11 @@ def test_handle_two_factor_auth(self, request_mock):
             headers={'X-GitHub-OTP': 'fake'}
             )
 
-    @patch.object(requests.Session, 'request')
+    @mock.patch.object(requests.Session, 'request')
     def test_request_ignores_responses_that_do_not_require_2fa(self,
                                                                request_mock):
         """Test that request does not try to handle 2fa when it should not"""
-        response = Mock()
+        response = mock.Mock()
         response.configure_mock(status_code=200, headers={})
         request_mock.return_value = response
         s = self.build_session()
@@ -114,10 +111,10 @@ def test_request_ignores_responses_that_do_not_require_2fa(self,
             'GET', 'http://example.com', allow_redirects=True
             )
 
-    @patch.object(requests.Session, 'request')
+    @mock.patch.object(requests.Session, 'request')
     def test_creates_history_while_handling_2fa(self, request_mock):
         """Test that the overridden request method will create history"""
-        response = Mock()
+        response = mock.Mock()
         response.configure_mock(
             status_code=401,
             headers={'X-GitHub-OTP': 'required;2fa'},
diff --git a/tests/unit/test_structs.py b/tests/unit/test_structs.py
@@ -1,11 +1,6 @@
-from .helper import UnitHelper
+from .helper import UnitHelper, mock
 from github3.structs import GitHubIterator
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
-
 
 class TestGitHubIterator(UnitHelper):
     described_class = GitHubIterator
