From 7ee19a0f78835c62c89cb3f3ee89135ea17a1bf9 Mon Sep 17 00:00:00 2001
From: Hannes Ljungberg <hannes@5monkeys.se>
Date: Sun, 17 May 2020 23:20:16 +0200
Subject: [PATCH] [3.1.x] Fixed #31601 -- Fixed SearchHeadlineTests on
 PostgresSQL 9.6.18+, 10.13+, 11.8+, and 12.3+.

Backport of 952afc166c8d79013b7181e35aab638145d2adc5 from master
---
 tests/postgres_tests/test_search.py | 16 +++++++++-------
 1 file 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(