Merge branch 'master' into fix/manage.sh

1 files changed, 18 insertions, 11 deletions

diff --git a/searx/testing.py b/searx/testing.py
index a3616dc12..f0e303e13 100644
--- a/searx/testing.py
+++ b/searx/testing.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
+# SPDX-License-Identifier: AGPL-3.0-or-later
 """Shared testing code."""
 
+# pylint: disable=missing-function-docstring
 
 import os
 import subprocess
 import traceback
 
-from os.path import dirname, join, abspath
+from os.path import dirname, join, abspath, realpath
 
 from splinter import Browser
 from unittest2 import TestCase
@@ -17,21 +19,21 @@ class SearxTestLayer:
 
     __name__ = u'SearxTestLayer'
 
+    @classmethod
     def setUp(cls):
         pass
-    setUp = classmethod(setUp)
 
+    @classmethod
     def tearDown(cls):
         pass
-    tearDown = classmethod(tearDown)
 
+    @classmethod
     def testSetUp(cls):
         pass
-    testSetUp = classmethod(testSetUp)
 
+    @classmethod
     def testTearDown(cls):
         pass
-    testTearDown = classmethod(testTearDown)
 
 
 class SearxRobotLayer():
@@ -41,14 +43,19 @@ class SearxRobotLayer():
         os.setpgrp()  # create new process group, become its leader
 
         # get program paths
-        webapp = os.path.join(
-            os.path.abspath(os.path.dirname(os.path.realpath(__file__))),
-            'webapp.py'
-        )
+        webapp = join(abspath(dirname(realpath(__file__))), 'webapp.py')
         exe = 'python'
 
+        # The Flask app is started by Flask.run(...), don't enable Flask's debug
+        # mode, the debugger from Flask will cause wired process model, where
+        # the server never dies.  Further read:
+        #
+        # - debug mode: https://flask.palletsprojects.com/quickstart/#debug-mode
+        # - Flask.run(..): https://flask.palletsprojects.com/api/#flask.Flask.run
+
+        os.environ['SEARX_DEBUG'] = '0'
+
         # set robot settings path
-        os.environ['SEARX_DEBUG'] = '1'
         os.environ['SEARX_SETTINGS_PATH'] = abspath(
             dirname(__file__) + '/settings_robot.yml')
 
@@ -105,7 +112,7 @@ if __name__ == '__main__':
         try:
             test_layer.setUp()
             run_robot_tests([getattr(robot, x) for x in dir(robot) if x.startswith('test_')])
-        except Exception:
+        except Exception:  # pylint: disable=broad-except
             errors = True
             print('Error occured: {0}'.format(traceback.format_exc()))
         test_layer.tearDown()