9 files changed, 23 insertions, 14 deletions
diff --git a/pygithub3/tests/core/test_client.py b/pygithub3/tests/core/test_client.py
index 4a68687..f65fc80 100644
--- a/pygithub3/tests/core/test_client.py
+++ b/pygithub3/tests/core/test_client.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from unittest import TestCase
-
 import requests
+
 from mock import patch
 
+from pygithub3.tests.utils.core import TestCase
 from pygithub3.core.client import Client
 from pygithub3.exceptions import NotFound, BadRequest, UnprocessableEntity
 from pygithub3.tests.utils.base import mock_response
diff --git a/pygithub3/tests/core/test_result.py b/pygithub3/tests/core/test_result.py
index 3c26630..a42bd44 100644
--- a/pygithub3/tests/core/test_result.py
+++ b/pygithub3/tests/core/test_result.py
@@ -1,10 +1,9 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from unittest import TestCase
-
 from mock import Mock
 
+from pygithub3.tests.utils.core import TestCase
 from pygithub3.core.client import Client
 from pygithub3.core.result import Result, Page
 from pygithub3.tests.utils.core import (mock_paginate_github_in_GET, request,
diff --git a/pygithub3/tests/requests/test_core.py b/pygithub3/tests/requests/test_core.py
index 3f2d615..cd162b3 100644
--- a/pygithub3/tests/requests/test_core.py
+++ b/pygithub3/tests/requests/test_core.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from unittest import TestCase
 from mock import Mock
 
+from pygithub3.tests.utils.core import TestCase
 from pygithub3.requests.base import Factory, Body, json, Request
 from pygithub3.exceptions import (UriInvalid, DoesNotExists, ValidationError,
                                   InvalidBodySchema)
diff --git a/pygithub3/tests/resources/test_core.py b/pygithub3/tests/resources/test_core.py
index 9c05e2b..d8b8541 100644
--- a/pygithub3/tests/resources/test_core.py
+++ b/pygithub3/tests/resources/test_core.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from unittest import TestCase
 from datetime import datetime
 
+from pygithub3.tests.utils.core import TestCase
 from pygithub3.resources.base import Raw
 from pygithub3.tests.utils.resources import Nested, Simple, HasSimple
 
diff --git a/pygithub3/tests/services/test_core.py b/pygithub3/tests/services/test_core.py
index 612b5ea..8ee1c6e 100644
--- a/pygithub3/tests/services/test_core.py
+++ b/pygithub3/tests/services/test_core.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from unittest import TestCase
-from mock import patch
-
 import requests
 
+from mock import patch
+
+from pygithub3.tests.utils.core import TestCase
 from pygithub3.services.base import Service, MimeTypeMixin
 from pygithub3.core.result import Result
 from pygithub3.tests.utils.base import DummyRequest, mock_response
@@ -68,7 +68,7 @@ class TestMimeType(TestCase):
 
     def test_WITH_mimetype(self, request_method):
         request_method.return_value = mock_response()
-        self.ms.set_html_mimetype()
+        self.ms.set_html()
         self.ms.dummy_request()
         request_method.assert_called_with('get', _('dummyrequest'),
             headers={'Accept': 'application/vnd.github.%s.html+json' %
diff --git a/pygithub3/tests/services/test_repos.py b/pygithub3/tests/services/test_repos.py
index 865c5df..1993340 100644
--- a/pygithub3/tests/services/test_repos.py
+++ b/pygithub3/tests/services/test_repos.py
@@ -1,11 +1,10 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from unittest import TestCase
-
 import requests
 from mock import patch, Mock
 
+from pygithub3.tests.utils.core import TestCase
 from pygithub3.services.repos import (Repos, Collaborators, Commits, Downloads,
                                       Forks, Keys, Watchers)
 from pygithub3.resources.base import json
diff --git a/pygithub3/tests/services/test_users.py b/pygithub3/tests/services/test_users.py
index 049197b..f777d6d 100644
--- a/pygithub3/tests/services/test_users.py
+++ b/pygithub3/tests/services/test_users.py
@@ -1,11 +1,10 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from unittest import TestCase
-
 import requests
 from mock import patch, Mock
 
+from pygithub3.tests.utils.core import TestCase
 from pygithub3.core.client import Client
 from pygithub3.services.users import User, Emails, Followers, Keys
 from pygithub3.exceptions import ValidationError
diff --git a/pygithub3/tests/utils/core.py b/pygithub3/tests/utils/core.py
index 8d18732..32170e4 100644
--- a/pygithub3/tests/utils/core.py
+++ b/pygithub3/tests/utils/core.py
@@ -1,6 +1,11 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
+try:
+    from unittest2 import TestCase  # Python 2.6
+except ImportError:
+    from unittest import TestCase  # Python >2.7
+
 from .base import Mock, DummyRequest
 
 request = DummyRequest()
diff --git a/pygithub3/tests/utils/resources.py b/pygithub3/tests/utils/resources.py
index d9e4975..be9245b 100644
--- a/pygithub3/tests/utils/resources.py
+++ b/pygithub3/tests/utils/resources.py
@@ -1,7 +1,14 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
+from mock import Mock
+
 from .base import Resource
+from pygithub3.resources.base import json
+from pygithub3.tests.utils.base import mock_json
+
+json.dumps = Mock(side_effect=mock_json)
+json.loads = Mock(side_effect=mock_json)
 
 
 class Simple(Resource):