From 7a77df4abf5817ceae50a6997db6194bea09867d Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 19 Dec 2017 13:39:51 +0100 Subject: [PATCH] tests: increase timeouts for better test stability --- rhodecode/tests/server_utils.py | 2 +- rhodecode/tests/vcs_operations/conftest.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rhodecode/tests/server_utils.py b/rhodecode/tests/server_utils.py index 236706c5..6cd63611 100644 --- a/rhodecode/tests/server_utils.py +++ b/rhodecode/tests/server_utils.py @@ -90,7 +90,7 @@ class ServerBase(object): with open(self.log_file) as f: return f.read() - def wait_until_ready(self, timeout=15): + def wait_until_ready(self, timeout=30): host = self._config['host'] port = self._config['port'] status_url = self.status_url_tmpl.format(host=host, port=port) diff --git a/rhodecode/tests/vcs_operations/conftest.py b/rhodecode/tests/vcs_operations/conftest.py index 1dea6ae8..aca6bb06 100644 --- a/rhodecode/tests/vcs_operations/conftest.py +++ b/rhodecode/tests/vcs_operations/conftest.py @@ -131,7 +131,10 @@ def rc_web_server( vcsserver_factory( request, vcsserver_port=vcsserver_port, log_file=vcs_log, - overrides=({'server:main': {'workers': 2}},)) + overrides=( + {'server:main': {'workers': 2}}, + {'server:main': {'graceful_timeout': 10}}, + )) rc_log = os.path.join(tempfile.gettempdir(), 'rc_op_web.log') rc_web_server_config = rc_web_server_config_factory(