diff options
| author | Hannes Ljungberg <hannes@5monkeys.se> | 2020-05-17 23:20:16 +0200 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-05-19 08:04:27 +0200 |
| commit | 7ee19a0f78835c62c89cb3f3ee89135ea17a1bf9 (patch) | |
| tree | 5ce93eed4c7f07fdd2ebdda1eaf0af52de2c821a | |
| parent | 03bfcbad88a1ab8a29504a7a0eb9d7c31745c9c5 (diff) | |
[3.1.x] Fixed #31601 -- Fixed SearchHeadlineTests on PostgresSQL 9.6.18+, 10.13+, 11.8+, and 12.3+.
Backport of 952afc166c8d79013b7181e35aab638145d2adc5 from master
| -rw-r--r-- | tests/postgres_tests/test_search.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tests/postgres_tests/test_search.py b/tests/postgres_tests/test_search.py index f6c3031bd4..55113eb2c9 100644 --- a/tests/postgres_tests/test_search.py +++ b/tests/postgres_tests/test_search.py @@ -31,7 +31,7 @@ class GrailTestData: 'Bravely bold Sir Robin, rode forth from Camelot. ' 'He was not afraid to die, o Brave Sir Robin. ' 'He was not at all afraid to be killed in nasty ways. ' - 'Brave, brave, brave, brave Sir Robin!' + 'Brave, brave, brave, brave Sir Robin' ), ( 'He was not in the least bit scared to be mashed into a pulp, ' @@ -581,7 +581,7 @@ class SearchHeadlineTests(GrailTestData, PostgreSQLTestCase): self.assertEqual( searched.headline, 'Robin. He was not at all afraid to be <b>killed</b> in nasty ' - 'ways. Brave, brave, brave, brave Sir Robin!', + 'ways. Brave, brave, brave, brave Sir Robin', ) def test_headline_with_config(self): @@ -644,13 +644,15 @@ class SearchHeadlineTests(GrailTestData, PostgreSQLTestCase): searched = Line.objects.annotate( headline=SearchHeadline( 'dialogue', - SearchQuery('brave sir robin', config='english'), - short_word=6, + SearchQuery('Camelot', config='english'), + short_word=5, + min_words=8, ), ).get(pk=self.verse0.pk) - self.assertIs(searched.headline.endswith( - '<b>Brave</b>, <b>brave</b>, <b>brave</b>, <b>brave</b> <b>Sir</b>' - ), True) + self.assertEqual(searched.headline, ( + '<b>Camelot</b>. He was not afraid to die, o Brave Sir Robin. He ' + 'was not at all afraid' + )) def test_headline_fragments_words_options(self): searched = Line.objects.annotate( |