diff --git a/wagtail/wagtailsearch/tests/elasticsearch_common_tests.py b/wagtail/wagtailsearch/tests/elasticsearch_common_tests.py index 903cbb937..3cd214392 100644 --- a/wagtail/wagtailsearch/tests/elasticsearch_common_tests.py +++ b/wagtail/wagtailsearch/tests/elasticsearch_common_tests.py @@ -1,5 +1,6 @@ from __future__ import absolute_import, unicode_literals +import unittest from datetime import date from io import StringIO @@ -172,3 +173,41 @@ class ElasticsearchCommonSearchBackendTests(object): results = self.backend.search(MATCH_ALL, models.Book)[110:] self.assertEqual(len(results), 53) + + # + # Basic query classes + # + + # Not implemented yet + @unittest.expectedFailure + def test_term(self): + super().test_term() + + # Not implemented yet + @unittest.expectedFailure + def test_and(self): + super().test_and() + + # Not implemented yet + @unittest.expectedFailure + def test_or(self): + super().test_or() + + # Not implemented yet + @unittest.expectedFailure + def test_not(self): + super().test_not() + + # Not implemented yet + @unittest.expectedFailure + def test_operators_combination(self): + super().test_operators_combination() + + # + # Shortcut query classes + # + + # Not implemented yet + @unittest.expectedFailure + def test_filter_query(self): + super().test_filter_query() diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py index e921e7a6f..b82d8bb2d 100644 --- a/wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py +++ b/wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py @@ -37,44 +37,6 @@ class TestElasticsearch2SearchBackend(BackendTests, ElasticsearchCommonSearchBac def test_delete(self): super(TestElasticsearch2SearchBackend, self).test_delete() - # - # Basic query classes - # - - # Not implemented yet - @unittest.expectedFailure - def test_term(self): - super().test_term() - - # Not implemented yet - @unittest.expectedFailure - def test_and(self): - super().test_and() - - # Not implemented yet - @unittest.expectedFailure - def test_or(self): - super().test_or() - - # Not implemented yet - @unittest.expectedFailure - def test_not(self): - super().test_not() - - # Not implemented yet - @unittest.expectedFailure - def test_operators_combination(self): - super().test_operators_combination() - - # - # Shortcut query classes - # - - # Not implemented yet - @unittest.expectedFailure - def test_filter_query(self): - super().test_filter_query() - class TestElasticsearch2SearchQuery(TestCase): def assertDictEqual(self, a, b):