0003-tests-chain-webtest-500-exceptions-to-the-internal-e.patch

Benjamin Dauvergne, 03 mars 2021 19:42

Voir les différences: en ligne côte à côte

Subject: [PATCH 3/3] tests: chain webtest 500 exceptions to the internal
 exception (#51327)

 tests/utilities.py      | 12 ++++++++++++
 wcs/qommon/publisher.py | 19 ++++++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

+        )
         compat.CompatWcsPublisher.cronjobs = None
         pub = compat.CompatWcsPublisher.create_publisher()
         pub.do_log_internal_error = False
         # allow saving the user
         pub.app_dir = os.path.join(APP_DIR, 'example.net')
         pub.site_charset = 'utf-8'
-...
             pass
     class TestApp(TestApp):
         def do_request(self, *args, **kwargs):
             try:
                 return super().do_request(*args, **kwargs)
             except Exception as e:
                 pub = get_publisher()
                 if pub.last_exc_info:
                     raise e from pub.last_exc_info[1]
                 raise
     def get_app(pub, https=False):
         extra_environ = {'HTTP_HOST': 'example.net', 'REMOTE_ADDR': '127.0.0.1'}
         if https:

         app_dir = None
         last_exc_info = None
         do_log_internal_error = True
         @property
         def form_tokens_dir(self):
             return os.path.join(self.app_dir, 'form_tokens')
-...
             original_response = request.response
             request.response = HTTPResponse()
             (exc_type, exc_value, tb) = sys.exc_info()
             self.last_exc_info = (exc_type, exc_value, tb) = sys.exc_info()
             if exc_type is NotImplementedError:
                 get_response().set_header('Content-Type', 'text/html')  # set back content-type
-...
                     request.response.set_header('Content-Type', 'text/plain')
                     error_page = plain_error_msg
             try:
                 self.logger.log_internal_error(error_summary, plain_error_msg)
             except socket.error:
                 # wilr happen if there is no mail server available and exceptions
                 # were configured to be mailed.
                 pass
             if self.log_internal_error:
                 try:
                     self.logger.log_internal_error(error_summary, plain_error_msg)
                 except socket.error:
                     # will happen if there is no mail server available and exceptions
                     # were configured to be mailed.
                     pass
             if exc_type is SystemExit:
                 raise exc_type
-...
                 self.cfg = {}
         def process(self, stdin, env):
             self.last_exc_info = None
             request = HTTPRequest(stdin, env)
             self.response = self.process_request(request)
             return self.response
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0003-tests-chain-webtest-500-exceptions-to-the-internal-e.patch