Utils to tests

3 files changed, 5 insertions, 23 deletions

diff --git a/pygithub3/tests/core/test_client.py b/pygithub3/tests/core/test_client.py
index 57051e2..c4227fa 100644
--- a/pygithub3/tests/core/test_client.py
+++ b/pygithub3/tests/core/test_client.py
@@ -5,7 +5,7 @@ from unittest import TestCase
 
 import requests
 from pygithub3.core.client import Client
-from pygithub3.exceptions import *
+from pygithub3.exceptions import NotFound, BadRequest, UnprocessableEntity
 from mock import patch
 
 
diff --git a/pygithub3/tests/core/test_result.py b/pygithub3/tests/core/test_result.py
index 4a3a7f5..3c26630 100644
--- a/pygithub3/tests/core/test_result.py
+++ b/pygithub3/tests/core/test_result.py
@@ -7,8 +7,8 @@ from mock import Mock
 
 from pygithub3.core.client import Client
 from pygithub3.core.result import Result, Page
-from .utils import (mock_paginate_github_in_GET,
-                    mock_no_paginate_github_in_GET, request)
+from pygithub3.tests.utils.core import (mock_paginate_github_in_GET, request,
+                                        mock_no_paginate_github_in_GET)
 
 
 class ResultInitMixin(object):
diff --git a/pygithub3/tests/core/utils.py b/pygithub3/tests/utils/core.py
index e77ef20..8d18732 100644
--- a/pygithub3/tests/core/utils.py
+++ b/pygithub3/tests/utils/core.py
@@ -1,27 +1,9 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from mock import Mock
+from .base import Mock, DummyRequest
 
-from pygithub3.resources.base import Resource
-from pygithub3.requests import Request
-
-
-class DummyResource(Resource):
-    pass
-
-
-def loads_mock(content):
-    return content
-DummyResource.loads = Mock(side_effect=loads_mock)
-
-
-class DummyRequest(Request):
-    uri = 'dummyrequest'
-    resource = DummyResource
-
-
-request = DummyRequest({})
+request = DummyRequest()
 # Working without json but name it json-related to not confuse
 json_content = [dict(name='dummy')]