Explorar el Código

[fix] robot tests

Adam Tauber hace 9 años
padre
commit
472a409022
Se han modificado 2 ficheros con 12 adiciones y 5 borrados
  1. 3
    0
      searx/settings_robot.yml
  2. 9
    5
      searx/testing.py

+ 3
- 0
searx/settings_robot.yml Ver fichero

1
 general:
1
 general:
2
     debug : False
2
     debug : False
3
+    instance_name : "searx_test"
3
 
4
 
4
 search:
5
 search:
5
     safe_search : 0
6
     safe_search : 0
25
   - name : general_dummy
26
   - name : general_dummy
26
     engine : dummy
27
     engine : dummy
27
     categories : general
28
     categories : general
29
+    shortcut : gd
28
 
30
 
29
   - name : dummy_dummy
31
   - name : dummy_dummy
30
     engine : dummy
32
     engine : dummy
31
     categories : dummy
33
     categories : dummy
34
+    shortcut : dd
32
 
35
 
33
 locales:
36
 locales:
34
     en : English
37
     en : English

+ 9
- 5
searx/testing.py Ver fichero

57
         )
57
         )
58
 
58
 
59
     def tearDown(self):
59
     def tearDown(self):
60
-        os.kill(self.server.pid, 15)
60
+        os.kill(self.server.pid, 9)
61
         # remove previously set environment variable
61
         # remove previously set environment variable
62
         del os.environ['SEARX_SETTINGS_PATH']
62
         del os.environ['SEARX_SETTINGS_PATH']
63
 
63
 
78
 
78
 
79
     base_dir = abspath(join(dirname(__file__), '../tests'))
79
     base_dir = abspath(join(dirname(__file__), '../tests'))
80
     if sys.argv[1] == 'robot':
80
     if sys.argv[1] == 'robot':
81
-        Runner(['--color',
82
-                '--auto-progress',
83
-                '--path', base_dir],
84
-               found_suites=[test_suite()]).run()
81
+        r = Runner(['--color',
82
+                    '--auto-progress',
83
+                    '--stop-on-error',
84
+                    '--path',
85
+                    base_dir],
86
+                    found_suites=[test_suite()])
87
+        r.run()
88
+        sys.exit(int(r.failed))