mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-29 09:33:54 +01:00
Code Issues Releases Wiki Activity

Fixes Python 2 & elasticsearch tests.

Browse Source
This commit is contained in:
Bertrand Bordage 2017-08-16 19:20:46 +02:00
parent 72f0a3a2fc
commit ac0d1f69c8
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wagtail/wagtailsearch/tests/test_backends.py
View File

@ -1,3 +1,5 @@
# coding: utf-8
from __future__ import absolute_import, unicode_literals
import time

4
wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py
View File

@ -761,7 +761,7 @@ class TestElasticsearch2Mapping(TestCase):
'published_date_filter': {'index': 'not_analyzed', 'type': 'date', 'include_in_all': False},
'title': {'type': 'string', 'include_in_all': True, 'analyzer': 'edgengram_analyzer', 'search_analyzer': 'standard'},
'title_filter': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False},
'content': {'type': 'string', 'include_in_all': True},
'content': {'type': 'string', 'boost': 2, 'include_in_all': True},
'callable_indexed_field': {'type': 'string', 'include_in_all': True},
'subobjects': {
'properties': {
@ -865,7 +865,7 @@ class TestElasticsearch2MappingInheritance(TestCase):
'published_date_filter': {'index': 'not_analyzed', 'type': 'date', 'include_in_all': False},
'title': {'type': 'string', 'include_in_all': True, 'analyzer': 'edgengram_analyzer', 'search_analyzer': 'standard'},
'title_filter': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False},
'content': {'type': 'string', 'include_in_all': True},
'content': {'type': 'string', 'boost': 2, 'include_in_all': True},
'callable_indexed_field': {'type': 'string', 'include_in_all': True},
'subobjects': {
'properties': {

4
wagtail/wagtailsearch/tests/test_elasticsearch5_backend.py
View File

@ -760,7 +760,7 @@ class TestElasticsearch5Mapping(TestCase):
'published_date_filter': {'type': 'date', 'include_in_all': False},
'title': {'type': 'text', 'include_in_all': True, 'analyzer': 'edgengram_analyzer', 'search_analyzer': 'standard'},
'title_filter': {'type': 'keyword', 'include_in_all': False},
'content': {'type': 'text', 'include_in_all': True},
'content': {'type': 'text', 'boost': 2, 'include_in_all': True},
'callable_indexed_field': {'type': 'text', 'include_in_all': True},
'subobjects': {
'properties': {
@ -864,7 +864,7 @@ class TestElasticsearch5MappingInheritance(TestCase):
'published_date_filter': {'type': 'date', 'include_in_all': False},
'title': {'type': 'text', 'include_in_all': True, 'analyzer': 'edgengram_analyzer', 'search_analyzer': 'standard'},
'title_filter': {'type': 'keyword', 'include_in_all': False},
'content': {'type': 'text', 'include_in_all': True},
'content': {'type': 'text', 'boost': 2, 'include_in_all': True},
'callable_indexed_field': {'type': 'text', 'include_in_all': True},
'subobjects': {
'properties': {

4
wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
View File

@ -774,7 +774,7 @@ class TestElasticsearchMapping(TestCase):
'published_date_filter': {'index': 'not_analyzed', 'type': 'date', 'include_in_all': False},
'title': {'type': 'string', 'include_in_all': True, 'index_analyzer': 'edgengram_analyzer'},
'title_filter': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False},
'content': {'type': 'string', 'include_in_all': True},
'content': {'type': 'string', 'boost': 2, 'include_in_all': True},
'callable_indexed_field': {'type': 'string', 'include_in_all': True},
'tags': {
'type': 'nested',
@ -881,7 +881,7 @@ class TestElasticsearchMappingInheritance(TestCase):
'published_date_filter': {'index': 'not_analyzed', 'type': 'date', 'include_in_all': False},
'title': {'type': 'string', 'include_in_all': True, 'index_analyzer': 'edgengram_analyzer'},
'title_filter': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False},
'content': {'type': 'string', 'include_in_all': True},
'content': {'type': 'string', 'boost': 2, 'include_in_all': True},
'callable_indexed_field': {'type': 'string', 'include_in_all': True},
'tags': {
'type': 'nested',