mirror of
https://github.com/searxng/searxng.git
synced 2025-07-24 21:59:22 +02:00
[fix] make flask_babel.gettext() work in engine modules (L10n & threads)
incident: flask_babel.gettext() does not work in the engine modules. cause: the request() and response() functions of the engine modules run in the processor, whose search() method runs in a thread and in the threads the context of the Flask app does not exist. The context of the Flask app is needed by the gettext() function for the L10n. Solution: copy context of the Flask app into the threads. [1] special case: We cannot equip the search() method of the processors with the decorator [1], because the decorator requires a context (Flask app) that does not yet exist at the time of the initialization of the processors (the initialization of the processors is part of the initialization of the Flask app). [1] https://flask.palletsprojects.com/en/2.3.x/api/#flask.copy_current_request_context Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
parent
c00c0c5434
commit
733b795d53
6 changed files with 43 additions and 173 deletions
|
@ -43,6 +43,12 @@ class SearchQueryTestCase(SearxTestCase):
|
|||
|
||||
|
||||
class SearchTestCase(SearxTestCase):
|
||||
def setUp(self):
|
||||
|
||||
from searx import webapp # pylint disable=import-outside-toplevel
|
||||
|
||||
self.app = webapp.app
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
searx.search.initialize(TEST_ENGINES)
|
||||
|
@ -53,7 +59,8 @@ class SearchTestCase(SearxTestCase):
|
|||
'test', [EngineRef(PUBLIC_ENGINE_NAME, 'general')], 'en-US', SAFESEARCH, PAGENO, None, None
|
||||
)
|
||||
search = searx.search.Search(search_query)
|
||||
search.search()
|
||||
with self.app.test_request_context('/search'):
|
||||
search.search()
|
||||
self.assertEqual(search.actual_timeout, 3.0)
|
||||
|
||||
def test_timeout_query_above_default_nomax(self):
|
||||
|
@ -62,7 +69,8 @@ class SearchTestCase(SearxTestCase):
|
|||
'test', [EngineRef(PUBLIC_ENGINE_NAME, 'general')], 'en-US', SAFESEARCH, PAGENO, None, 5.0
|
||||
)
|
||||
search = searx.search.Search(search_query)
|
||||
search.search()
|
||||
with self.app.test_request_context('/search'):
|
||||
search.search()
|
||||
self.assertEqual(search.actual_timeout, 3.0)
|
||||
|
||||
def test_timeout_query_below_default_nomax(self):
|
||||
|
@ -71,7 +79,8 @@ class SearchTestCase(SearxTestCase):
|
|||
'test', [EngineRef(PUBLIC_ENGINE_NAME, 'general')], 'en-US', SAFESEARCH, PAGENO, None, 1.0
|
||||
)
|
||||
search = searx.search.Search(search_query)
|
||||
search.search()
|
||||
with self.app.test_request_context('/search'):
|
||||
search.search()
|
||||
self.assertEqual(search.actual_timeout, 1.0)
|
||||
|
||||
def test_timeout_query_below_max(self):
|
||||
|
@ -80,7 +89,8 @@ class SearchTestCase(SearxTestCase):
|
|||
'test', [EngineRef(PUBLIC_ENGINE_NAME, 'general')], 'en-US', SAFESEARCH, PAGENO, None, 5.0
|
||||
)
|
||||
search = searx.search.Search(search_query)
|
||||
search.search()
|
||||
with self.app.test_request_context('/search'):
|
||||
search.search()
|
||||
self.assertEqual(search.actual_timeout, 5.0)
|
||||
|
||||
def test_timeout_query_above_max(self):
|
||||
|
@ -89,7 +99,8 @@ class SearchTestCase(SearxTestCase):
|
|||
'test', [EngineRef(PUBLIC_ENGINE_NAME, 'general')], 'en-US', SAFESEARCH, PAGENO, None, 15.0
|
||||
)
|
||||
search = searx.search.Search(search_query)
|
||||
search.search()
|
||||
with self.app.test_request_context('/search'):
|
||||
search.search()
|
||||
self.assertEqual(search.actual_timeout, 10.0)
|
||||
|
||||
def test_external_bang(self):
|
||||
|
@ -119,6 +130,7 @@ class SearchTestCase(SearxTestCase):
|
|||
)
|
||||
|
||||
search = searx.search.Search(search_query)
|
||||
results = search.search()
|
||||
with self.app.test_request_context('/search'):
|
||||
results = search.search()
|
||||
# This should not redirect
|
||||
self.assertTrue(results.redirect_url is None)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue