Explorar el Código

[fix] tests fix after result refactor

Adam Tauber hace 9 años
padre
commit
a959977ab4
Se han modificado 1 ficheros con 17 adiciones y 11 borrados
  1. 17
    11
      searx/tests/test_plugins.py

+ 17
- 11
searx/tests/test_plugins.py Ver fichero

@@ -5,6 +5,12 @@ from searx import plugins
5 5
 from mock import Mock
6 6
 
7 7
 
8
+def get_search_mock(query, **kwargs):
9
+    return {'search': Mock(query=query,
10
+                           result_container=Mock(answers=set()),
11
+                           **kwargs)}
12
+
13
+
8 14
 class PluginStoreTest(SearxTestCase):
9 15
 
10 16
     def test_PluginStore_init(self):
@@ -46,23 +52,23 @@ class SelfIPTest(SearxTestCase):
46 52
         request = Mock(user_plugins=store.plugins,
47 53
                        remote_addr='127.0.0.1')
48 54
         request.headers.getlist.return_value = []
49
-        ctx = {'search': Mock(answers=set(),
50
-                              query='ip')}
55
+        ctx = get_search_mock(query='ip')
51 56
         store.call('post_search', request, ctx)
52
-        self.assertTrue('127.0.0.1' in ctx['search'].answers)
57
+        self.assertTrue('127.0.0.1' in ctx['search'].result_container.answers)
53 58
 
54 59
         # User agent test
55 60
         request = Mock(user_plugins=store.plugins,
56 61
                        user_agent='Mock')
57 62
         request.headers.getlist.return_value = []
58
-        ctx = {'search': Mock(answers=set(),
59
-                              query='user-agent')}
63
+
64
+        ctx = get_search_mock(query='user-agent')
60 65
         store.call('post_search', request, ctx)
61
-        self.assertTrue('Mock' in ctx['search'].answers)
62
-        ctx = {'search': Mock(answers=set(),
63
-                              query='user agent')}
66
+        self.assertTrue('Mock' in ctx['search'].result_container.answers)
67
+
68
+        ctx = get_search_mock(query='user-agent')
64 69
         store.call('post_search', request, ctx)
65
-        self.assertTrue('Mock' in ctx['search'].answers)
66
-        ctx = {'search': Mock(answers=set(),
67
-                              query='What is my User-Agent?')}
70
+        self.assertTrue('Mock' in ctx['search'].result_container.answers)
71
+
72
+        ctx = get_search_mock(query='What is my User-Agent?')
68 73
         store.call('post_search', request, ctx)
74
+        self.assertTrue('Mock' in ctx['search'].result_container.answers)