diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py index 04d28689a..e9b656298 100644 --- a/wagtail/wagtailsearch/tests/test_backends.py +++ b/wagtail/wagtailsearch/tests/test_backends.py @@ -151,27 +151,6 @@ class BackendTests(object): self.assertEqual(len(results), 3) -class TestDBBackend(BackendTests, TestCase): - backend_path = 'wagtail.wagtailsearch.backends.db.DBSearch' - - @unittest.expectedFailure - def test_callable_indexed_field(self): - super(TestDBBackend, self).test_callable_indexed_field() - - -class TestElasticSearchBackend(BackendTests, TestCase): - backend_path = 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch' - - def test_search_with_spaces_only(self): - # Search for some space characters and hope it doesn't crash - results = self.backend.search(" ", models.SearchTest) - - # Queries are lazily evaluated, force it to run - list(results) - - # Didn't crash, yay! - - @override_settings(WAGTAILSEARCH_BACKENDS={ 'default': {'BACKEND': 'wagtail.wagtailsearch.backends.db.DBSearch'} }) diff --git a/wagtail/wagtailsearch/tests/test_db_backend.py b/wagtail/wagtailsearch/tests/test_db_backend.py new file mode 100644 index 000000000..f471a34d1 --- /dev/null +++ b/wagtail/wagtailsearch/tests/test_db_backend.py @@ -0,0 +1,13 @@ +from wagtail.tests.utils import unittest + +from django.test import TestCase + +from .test_backends import BackendTests + + +class TestDBBackend(BackendTests, TestCase): + backend_path = 'wagtail.wagtailsearch.backends.db.DBSearch' + + @unittest.expectedFailure + def test_callable_indexed_field(self): + super(TestDBBackend, self).test_callable_indexed_field() diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py new file mode 100644 index 000000000..c2623fd54 --- /dev/null +++ b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py @@ -0,0 +1,18 @@ +from wagtail.tests.utils import unittest + +from django.test import TestCase + +from .test_backends import BackendTests + + +class TestElasticSearchBackend(BackendTests, TestCase): + backend_path = 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch' + + def test_search_with_spaces_only(self): + # Search for some space characters and hope it doesn't crash + results = self.backend.search(" ", models.SearchTest) + + # Queries are lazily evaluated, force it to run + list(results) + + # Didn't crash, yay!