Update references to mock in api tests

sigmavirus24 · sigmavirus24 · commit 92e6f8234350 · 2014-05-04T13:52:29.000-05:00
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -1,14 +1,12 @@
 import github3
 from unittest import TestCase
-try:
-   from unittest.mock import patch, NonCallableMock
-except ImportError:
-   from mock import patch, NonCallableMock
+#from .utils.mock import patch, NonCallableMock
+from .utils import mock
 
 
 class TestAPI(TestCase):
     def setUp(self):
-        self.mock = patch('github3.api.gh', autospec=github3.GitHub)
+        self.mock = mock.patch('github3.api.gh', autospec=github3.GitHub)
         self.gh = self.mock.start()
 
     def tearDown(self):
@@ -17,21 +15,21 @@ def tearDown(self):
     def test_authorize(self):
         args = ('login', 'password', ['scope1'], 'note', 'note_url.com', '',
                 '')
-        with patch.object(github3.api.GitHub, 'authorize') as authorize:
+        with mock.patch.object(github3.api.GitHub, 'authorize') as authorize:
             github3.authorize(*args)
             authorize.assert_called_once_with(*args)
 
     def test_login(self):
         args = ('login', 'password', None, None)
-        with patch.object(github3.api.GitHub, 'login') as login:
+        with mock.patch.object(github3.api.GitHub, 'login') as login:
             g = github3.login(*args)
             assert isinstance(g, github3.github.GitHub)
             assert not isinstance(g, github3.github.GitHubEnterprise)
             login.assert_called_with(*args)
 
     def test_enterprise_login(self):
         args = ('login', 'password', None, 'http://ghe.invalid/', None)
-        with patch.object(github3.api.GitHubEnterprise, 'login') as login:
+        with mock.patch.object(github3.api.GitHubEnterprise, 'login') as login:
             g = github3.login(*args)
             assert isinstance(g, github3.github.GitHubEnterprise)
             login.assert_called_with('login', 'password', None, None)
@@ -146,7 +144,7 @@ def test_rate_limit(self):
     def test_ratelimit_remaining(self):
         # This prevents a regression in the API
         # See 81c800658db43f86419b9c0764fc16aad3d60007
-        self.gh.ratelimit_remaining = NonCallableMock()
+        self.gh.ratelimit_remaining = mock.NonCallableMock()
         github3.ratelimit_remaining()
 
     def test_zen(self):
