Correct unittest imports from commit e37c1f3

Author: benspaulding

test_haystack/elasticsearch_tests/__init__.py

@@ -4,19 +4,19 @@
 
 from django.conf import settings
 
-from ..utils.unittest import SkipTest
+from ..utils import unittest
 
 warnings.simplefilter('ignore', Warning)
 
 def setup():
     try:
         from elasticsearch import Elasticsearch, ElasticsearchException
     except ImportError:
-        raise SkipTest("elasticsearch-py not installed.")
+        raise unittest.SkipTest("elasticsearch-py not installed.")
 
     es = Elasticsearch(settings.HAYSTACK_CONNECTIONS['elasticsearch']['URL'])
     try:
         es.info()
     except ElasticsearchException as e:
-        raise SkipTest("elasticsearch not running on %r" % settings.HAYSTACK_CONNECTIONS['elasticsearch']['URL'], e)
+        raise unittest.SkipTest("elasticsearch not running on %r" % settings.HAYSTACK_CONNECTIONS['elasticsearch']['URL'], e)
 

test_haystack/solr_tests/test_solr_backend.py

@@ -22,7 +22,7 @@
 
 from ..core.models import AFourthMockModel, AnotherMockModel, ASixthMockModel, MockModel
 from ..mocks import MockSearchResult
-from ..utils.unittest import skipIf, skipUnless
+from ..utils import unittest
 
 test_pickling = True
 
@@ -1318,7 +1318,7 @@ def test_round_trip(self):
         self.assertEqual(result.sites, [3, 5, 1])
 
 
-@skipUnless(test_pickling, 'Skipping pickling tests')
+@unittest.skipUnless(test_pickling, 'Skipping pickling tests')
 class LiveSolrPickleTestCase(TestCase):
     fixtures = ['bulk_data.json']
 
@@ -1409,7 +1409,7 @@ def test_boost(self):
         ])
 
 
-@skipIf(pysolr.__version__ < (3, 1, 1), 'content extraction requires pysolr > 3.1.0')
+@unittest.skipIf(pysolr.__version__ < (3, 1, 1), 'content extraction requires pysolr > 3.1.0')
 class LiveSolrContentExtractionTestCase(TestCase):
     def setUp(self):
         super(LiveSolrContentExtractionTestCase, self).setUp()

test_haystack/test_app_using_appconfig/tests.py

@@ -7,11 +7,11 @@
 
 
 from .models import MicroBlogPost
-from ..utils.unittest import skipIf
+from ..utils import unittest
 
 
 
-@skipIf(django.VERSION < (1, 7), 'AppConfig tests do not apply to Django versions before 1.7')
+@unittest.skipIf(django.VERSION < (1, 7), 'AppConfig tests do not apply to Django versions before 1.7')
 class AppConfigTests(TestCase):
     def test_index_collection(self):
         from haystack import connections

test_haystack/test_models.py

@@ -16,7 +16,7 @@
 
 from .mocks import MockSearchResult
 from .test_indexes import ReadQuerySetTestSearchIndex
-from ..utils import unittest
+from .utils import unittest
 
 
 class CaptureHandler(std_logging.Handler):

test_haystack/test_query.py

@@ -7,7 +7,7 @@
 from django.test import TestCase
 from django.test.utils import override_settings
 from test_haystack.core.models import AFifthMockModel, AnotherMockModel, CharPKMockModel, MockModel
-from test_haystack.utils.unittest import skipUnless
+from test_haystack.utils import unittest
 
 from haystack import connection_router, connections, indexes, reset_search_queries
 from haystack.backends import BaseSearchQuery, SQ
@@ -848,7 +848,7 @@ def test_dictionary_lookup(self):
         self.assertRaises(TypeError, lambda: self.esqs['count'])
 
 
-@skipUnless(test_pickling, 'Skipping pickling tests')
+@unittest.skipUnless(test_pickling, 'Skipping pickling tests')
 @override_settings(DEBUG=True)
 class PickleSearchQuerySetTestCase(TestCase):
     def setUp(self):