[fix] webapp tests

1 files changed, 9 insertions, 33 deletions

diff --git a/searx/tests/test_webapp.py b/searx/tests/test_webapp.py
index 8bbe5d056..32eff5fa5 100644
--- a/searx/tests/test_webapp.py
+++ b/searx/tests/test_webapp.py
@@ -2,7 +2,6 @@
 
 import json
 from urlparse import ParseResult
-from mock import patch
 from searx import webapp
 from searx.testing import SearxTestCase
 
@@ -33,6 +32,11 @@ class ViewsTestCase(SearxTestCase):
             },
         ]
 
+        def search_mock(search_self, *args):
+            search_self.results = self.test_results
+
+        webapp.Search.search = search_mock
+
         self.maxDiff = None  # to see full diffs
 
     def test_index_empty(self):
@@ -40,14 +44,7 @@ class ViewsTestCase(SearxTestCase):
         self.assertEqual(result.status_code, 200)
         self.assertIn('<div class="title"><h1>searx</h1></div>', result.data)
 
-    @patch('searx.search.Search.search')
-    def test_index_html(self, search):
-        search.return_value = (
-            self.test_results,
-            set(),
-            set(),
-            set()
-        )
+    def test_index_html(self):
         result = self.app.post('/', data={'q': 'test'})
         self.assertIn(
             '<h3 class="result_title"><img width="14" height="14" class="favicon" src="/static/themes/default/img/icons/icon_youtube.ico" alt="youtube" /><a href="http://second.test.xyz">Second <span class="highlight">Test</span></a></h3>',  # noqa
@@ -58,14 +55,7 @@ class ViewsTestCase(SearxTestCase):
             result.data
         )
 
-    @patch('searx.search.Search.search')
-    def test_index_json(self, search):
-        search.return_value = (
-            self.test_results,
-            set(),
-            set(),
-            set()
-        )
+    def test_index_json(self):
         result = self.app.post('/', data={'q': 'test', 'format': 'json'})
 
         result_dict = json.loads(result.data)
@@ -76,14 +66,7 @@ class ViewsTestCase(SearxTestCase):
         self.assertEqual(
             result_dict['results'][0]['url'], 'http://first.test.xyz')
 
-    @patch('searx.search.Search.search')
-    def test_index_csv(self, search):
-        search.return_value = (
-            self.test_results,
-            set(),
-            set(),
-            set()
-        )
+    def test_index_csv(self):
         result = self.app.post('/', data={'q': 'test', 'format': 'csv'})
 
         self.assertEqual(
@@ -93,14 +76,7 @@ class ViewsTestCase(SearxTestCase):
             result.data
         )
 
-    @patch('searx.search.Search.search')
-    def test_index_rss(self, search):
-        search.return_value = (
-            self.test_results,
-            set(),
-            set(),
-            set()
-        )
+    def test_index_rss(self):
         result = self.app.post('/', data={'q': 'test', 'format': 'rss'})
 
         self.assertIn(