From bb04699b17e014089e6dd6d0af2f01b9717ad58c Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 30 Oct 2024 13:16:31 +0100 Subject: [fix] unit tests: call searx.search.initialize in test's setUp Depending on the order the unit tests are executed, the searx.search module is initalized or not, issue reported in [1]:: Traceback (most recent call last): File "searxng/tests/unit/test_results.py", line 72, in test_result_merge_by_title self.container.extend('stract', [fake_result(engine='stract', title='short title')]) File "searxng/searx/results.py", line 243, in extend histogram_observe(standard_result_count, 'engine', engine_name, 'result', 'count') File "searxng/searx/metrics/__init__.py", line 49, in histogram_observe histogram_storage.get(*args).observe(duration) ^^^^^^^^^^^^^^^^^^^^^ AttributeError: 'NoneType' object has no attribute 'get' To ensure that the searx.search module is initialized, the - searx.engines.load_engines is replace by - searx.search.initialize [1] https://github.com/searxng/searxng/pull/3932#discussion_r1822406569 Signed-off-by: Markus Heiser --- tests/unit/test_engine_tineye.py | 42 +++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 18 deletions(-) (limited to 'tests/unit/test_engine_tineye.py') diff --git a/tests/unit/test_engine_tineye.py b/tests/unit/test_engine_tineye.py index 5855a7313..7dc8233d4 100644 --- a/tests/unit/test_engine_tineye.py +++ b/tests/unit/test_engine_tineye.py @@ -1,28 +1,34 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # pylint: disable=missing-module-docstring - +import logging from datetime import datetime from unittest.mock import Mock from requests import HTTPError from parameterized import parameterized -from searx.engines import load_engines, tineye +import searx.search +import searx.engines from tests import SearxTestCase class TinEyeTests(SearxTestCase): # pylint: disable=missing-class-docstring def setUp(self): - load_engines([{'name': 'tineye', 'engine': 'tineye', 'shortcut': 'tin', 'timeout': 9.0, 'disabled': True}]) + searx.search.initialize( + [{'name': 'tineye', 'engine': 'tineye', 'shortcut': 'tin', 'timeout': 9.0, 'disabled': True}] + ) + + self.tineye = searx.engines.engines['tineye'] + self.tineye.logger.setLevel(logging.CRITICAL) def tearDown(self): - load_engines([]) + searx.search.load_engines([]) def test_status_code_raises(self): response = Mock() response.status_code = 401 response.raise_for_status.side_effect = HTTPError() - self.assertRaises(HTTPError, lambda: tineye.response(response)) + self.assertRaises(HTTPError, lambda: self.tineye.response(response)) @parameterized.expand([(400), (422)]) def test_returns_empty_list(self, status_code): @@ -30,7 +36,7 @@ class TinEyeTests(SearxTestCase): # pylint: disable=missing-class-docstring response.json.return_value = {} response.status_code = status_code response.raise_for_status.side_effect = HTTPError() - results = tineye.response(response) + results = self.tineye.response(response) self.assertEqual(0, len(results)) def test_logs_format_for_422(self): @@ -39,9 +45,9 @@ class TinEyeTests(SearxTestCase): # pylint: disable=missing-class-docstring response.status_code = 422 response.raise_for_status.side_effect = HTTPError() - with self.assertLogs(tineye.logger) as assert_logs_context: - tineye.response(response) - self.assertIn(tineye.FORMAT_NOT_SUPPORTED, ','.join(assert_logs_context.output)) + with self.assertLogs(self.tineye.logger) as assert_logs_context: + self.tineye.response(response) + self.assertIn(self.tineye.FORMAT_NOT_SUPPORTED, ','.join(assert_logs_context.output)) def test_logs_signature_for_422(self): response = Mock() @@ -49,9 +55,9 @@ class TinEyeTests(SearxTestCase): # pylint: disable=missing-class-docstring response.status_code = 422 response.raise_for_status.side_effect = HTTPError() - with self.assertLogs(tineye.logger) as assert_logs_context: - tineye.response(response) - self.assertIn(tineye.NO_SIGNATURE_ERROR, ','.join(assert_logs_context.output)) + with self.assertLogs(self.tineye.logger) as assert_logs_context: + self.tineye.response(response) + self.assertIn(self.tineye.NO_SIGNATURE_ERROR, ','.join(assert_logs_context.output)) def test_logs_download_for_422(self): response = Mock() @@ -59,9 +65,9 @@ class TinEyeTests(SearxTestCase): # pylint: disable=missing-class-docstring response.status_code = 422 response.raise_for_status.side_effect = HTTPError() - with self.assertLogs(tineye.logger) as assert_logs_context: - tineye.response(response) - self.assertIn(tineye.DOWNLOAD_ERROR, ','.join(assert_logs_context.output)) + with self.assertLogs(self.tineye.logger) as assert_logs_context: + self.tineye.response(response) + self.assertIn(self.tineye.DOWNLOAD_ERROR, ','.join(assert_logs_context.output)) def test_logs_description_for_400(self): description = 'There was a problem with that request. Error ID: ad5fc955-a934-43c1-8187-f9a61d301645' @@ -70,8 +76,8 @@ class TinEyeTests(SearxTestCase): # pylint: disable=missing-class-docstring response.status_code = 400 response.raise_for_status.side_effect = HTTPError() - with self.assertLogs(tineye.logger) as assert_logs_context: - tineye.response(response) + with self.assertLogs(self.tineye.logger) as assert_logs_context: + self.tineye.response(response) self.assertIn(description, ','.join(assert_logs_context.output)) def test_crawl_date_parses(self): @@ -90,5 +96,5 @@ class TinEyeTests(SearxTestCase): # pylint: disable=missing-class-docstring ] } response.status_code = 200 - results = tineye.response(response) + results = self.tineye.response(response) self.assertEqual(date, results[0]['publishedDate']) -- cgit v1.2.3