From 45775abb8134e6cbc3956cc2885ccb9e9e0fbe81 Mon Sep 17 00:00:00 2001 From: RhodeCode Admin Date: Wed, 17 Jul 2024 20:35:17 +0200 Subject: [PATCH] fix(tests): fixed potential freeze on vcs_operations tests --- rhodecode/tests/fixture_mods/fixture_pyramid.py | 2 +- rhodecode/tests/server_utils.py | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/rhodecode/tests/fixture_mods/fixture_pyramid.py b/rhodecode/tests/fixture_mods/fixture_pyramid.py index d94aaa5d..415dfc9c 100644 --- a/rhodecode/tests/fixture_mods/fixture_pyramid.py +++ b/rhodecode/tests/fixture_mods/fixture_pyramid.py @@ -58,7 +58,7 @@ def vcsserver_factory(tmpdir_factory): """ def factory(request, overrides=(), vcsserver_port=None, - log_file=None, workers='2'): + log_file=None, workers='3'): if vcsserver_port is None: vcsserver_port = get_available_port() diff --git a/rhodecode/tests/server_utils.py b/rhodecode/tests/server_utils.py index da82dbb5..4b062a47 100644 --- a/rhodecode/tests/server_utils.py +++ b/rhodecode/tests/server_utils.py @@ -143,13 +143,14 @@ class RcVCSServer(ServerBase): log_file_name = 'rc-vcsserver.log' status_url_tmpl = 'http://{host}:{port}/status' - def __init__(self, config_file, log_file=None, workers='2'): + def __init__(self, config_file, log_file=None, workers='3'): super(RcVCSServer, self).__init__(config_file, log_file) self._args = [ 'gunicorn', '--bind', self.bind_addr, - '--worker-class', 'gthread', - '--backlog', '16', + '--worker-class', 'sync', + '--threads', '1', + '--backlog', '8', '--timeout', '300', '--workers', workers, '--paste', self.config_file] @@ -180,13 +181,14 @@ class RcWebServer(ServerBase): log_file_name = 'rc-web.log' status_url_tmpl = 'http://{host}:{port}/_admin/ops/ping' - def __init__(self, config_file, log_file=None, workers='1'): + def __init__(self, config_file, log_file=None, workers='2'): super(RcWebServer, self).__init__(config_file, log_file) self._args = [ 'gunicorn', '--bind', self.bind_addr, '--worker-class', 'gthread', - '--backlog', '16', + '--threads', '4', + '--backlog', '8', '--timeout', '300', '--workers', workers, '--paste', self.config_file]