Use unittest2 even for python 2.6

test_elasticsearch/test_server/__init__.py

@@ -8,7 +8,7 @@ import requests
 from elasticsearch import Elasticsearch
 from elasticsearch.exceptions import ConnectionError
 
-from unittest import SkipTest, TestCase
+from ..test_cases import TestCase, SkipTest
 
 data_dir = None
 

test_elasticsearch/test_server/test_common.py

@@ -6,8 +6,8 @@ clients.
 from os import walk, environ
 from os.path import exists, join, dirname, pardir
 import yaml
-from unittest import SkipTest
 
+from ..test_cases import SkipTest
 from . import ElasticTestCase
 
 # some params had to be changed in python, keep track of them so we can rename

test_elasticsearch/test_server/test_memcached.py

@@ -4,8 +4,7 @@ from elasticsearch import Elasticsearch, MemcachedConnection, NotFoundError
 from elasticsearch.transport import ADDRESS_RE
 
 from . import ElasticTestCase
-
-from unittest import SkipTest
+from ..test_cases import SkipTest
 
 class TestMemcachedConnection(ElasticTestCase):
     def setUp(self):