ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

[fix] fix monkey patch in test_webapp.py (#1667) 

at the end of test_webapp.py, the monkey patch of searx.search.Search was not revert which lead to side effects on other tests
close #1663
This commit is contained in:
Alexandre Flament 2019-08-03 13:23:36 +02:00 committed by GitHub
parent d24e7948eb
commit 333e54943d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
searx/testing.py
View File

@ -80,6 +80,18 @@ class SearxTestCase(TestCase):
layer = SearxTestLayer layer = SearxTestLayer
def setattr4test(self, obj, attr, value):
"""
setattr(obj, attr, value)
but reset to the previous value in the cleanup.
"""
previous_value = getattr(obj, attr)
def cleanup_patch():
setattr(obj, attr, previous_value)
self.addCleanup(cleanup_patch)
setattr(obj, attr, value)
if __name__ == '__main__': if __name__ == '__main__':
import sys import sys

13
tests/unit/test_webapp.py
View File

@ -15,7 +15,7 @@ class ViewsTestCase(SearxTestCase):
self.app = webapp.app.test_client() self.app = webapp.app.test_client()
# set some defaults # set some defaults
self.test_results = [ test_results = [
{ {
'content': 'first test content', 'content': 'first test content',
'title': 'First Test', 'title': 'First Test',
@ -47,25 +47,25 @@ class ViewsTestCase(SearxTestCase):
] ]
def search_mock(search_self, *args): def search_mock(search_self, *args):
search_self.result_container = Mock(get_ordered_results=lambda: self.test_results, search_self.result_container = Mock(get_ordered_results=lambda: test_results,
answers=set(), answers=set(),
corrections=set(), corrections=set(),
suggestions=set(), suggestions=set(),
infoboxes=[], infoboxes=[],
unresponsive_engines=set(), unresponsive_engines=set(),
results=self.test_results, results=test_results,
results_number=lambda: 3, results_number=lambda: 3,
results_length=lambda: len(self.test_results), results_length=lambda: len(test_results),
get_timings=lambda: timings) get_timings=lambda: timings)
Search.search = search_mock self.setattr4test(Search, 'search', search_mock)
def get_current_theme_name_mock(override=None): def get_current_theme_name_mock(override=None):
if override: if override:
return override return override
return 'legacy' return 'legacy'
webapp.get_current_theme_name = get_current_theme_name_mock self.setattr4test(webapp, 'get_current_theme_name', get_current_theme_name_mock)
self.maxDiff = None # to see full diffs self.maxDiff = None # to see full diffs
@ -91,6 +91,7 @@ class ViewsTestCase(SearxTestCase):
result_dict = json.loads(result.data.decode('utf-8')) result_dict = json.loads(result.data.decode('utf-8'))
self.assertEqual('test', result_dict['query']) self.assertEqual('test', result_dict['query'])
self.assertEqual(len(result_dict['results']), 2)
self.assertEqual(result_dict['results'][0]['content'], 'first test content') self.assertEqual(result_dict['results'][0]['content'], 'first test content')
self.assertEqual(result_dict['results'][0]['url'], 'http://first.test.xyz') self.assertEqual(result_dict['results'][0]['url'], 'http://first.test.xyz')