From 1c22c72afce15585070829054e3460a61947e256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= Date: Mon, 23 Jan 2017 12:10:22 +0000 Subject: [PATCH] Increasing timeouts for running integrations tests --- tests/integration/__init__.py | 16 ++++++++-------- tests/integration/runners/state.py | 2 +- tests/integration/shell/call.py | 6 +++--- tests/integration/shell/key.py | 2 +- tests/integration/shell/matcher.py | 2 +- tests/integration/shell/runner.py | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py index a37ad61d2e..104566363a 100644 --- a/tests/integration/__init__.py +++ b/tests/integration/__init__.py @@ -801,7 +801,7 @@ class TestDaemon(object): ) sys.stdout.flush() process.start() - process.wait_until_running(timeout=15) + process.wait_until_running(timeout=60) sys.stdout.write( '\r{0}\r'.format( ' ' * getattr(self.parser.options, 'output_columns', PNUM) @@ -1863,14 +1863,14 @@ class ShellCase(AdaptedConfigurationTestCaseMixIn, ShellTestCase, ScriptPathMixi except OSError: os.chdir(INTEGRATION_TEST_DIR) - def run_salt(self, arg_str, with_retcode=False, catch_stderr=False, timeout=30): # pylint: disable=W0221 + def run_salt(self, arg_str, with_retcode=False, catch_stderr=False, timeout=60): # pylint: disable=W0221 ''' Execute salt ''' arg_str = '-c {0} {1}'.format(self.get_config_dir(), arg_str) return self.run_script('salt', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, timeout=timeout) - def run_ssh(self, arg_str, with_retcode=False, catch_stderr=False, timeout=25): # pylint: disable=W0221 + def run_ssh(self, arg_str, with_retcode=False, catch_stderr=False, timeout=60): # pylint: disable=W0221 ''' Execute salt-ssh ''' @@ -1885,7 +1885,7 @@ class ShellCase(AdaptedConfigurationTestCaseMixIn, ShellTestCase, ScriptPathMixi arg_str, timeout=timeout, async_flag=' --async' if async else '') - return self.run_script('salt-run', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, timeout=30) + return self.run_script('salt-run', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, timeout=60) def run_run_plus(self, fun, *arg, **kwargs): ''' @@ -1932,7 +1932,7 @@ class ShellCase(AdaptedConfigurationTestCaseMixIn, ShellTestCase, ScriptPathMixi arg_str, catch_stderr=catch_stderr, with_retcode=with_retcode, - timeout=30 + timeout=60 ) def run_cp(self, arg_str, with_retcode=False, catch_stderr=False): @@ -1940,16 +1940,16 @@ class ShellCase(AdaptedConfigurationTestCaseMixIn, ShellTestCase, ScriptPathMixi Execute salt-cp ''' arg_str = '--config-dir {0} {1}'.format(self.get_config_dir(), arg_str) - return self.run_script('salt-cp', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, timeout=30) + return self.run_script('salt-cp', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, timeout=60) def run_call(self, arg_str, with_retcode=False, catch_stderr=False): ''' Execute salt-call. ''' arg_str = '--config-dir {0} {1}'.format(self.get_config_dir(), arg_str) - return self.run_script('salt-call', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, timeout=30) + return self.run_script('salt-call', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, timeout=60) - def run_cloud(self, arg_str, catch_stderr=False, timeout=15): + def run_cloud(self, arg_str, catch_stderr=False, timeout=30): ''' Execute salt-cloud ''' diff --git a/tests/integration/runners/state.py b/tests/integration/runners/state.py index 07cfe15fe0..3ca74e915b 100644 --- a/tests/integration/runners/state.py +++ b/tests/integration/runners/state.py @@ -109,7 +109,7 @@ class OrchEventTest(integration.ShellCase): Tests for orchestration events ''' def setUp(self): - self.timeout = 15 + self.timeout = 60 self.master_d_dir = os.path.join(self.get_config_dir(), 'master.d') try: os.makedirs(self.master_d_dir) diff --git a/tests/integration/shell/call.py b/tests/integration/shell/call.py index 275878f7ca..e444743720 100644 --- a/tests/integration/shell/call.py +++ b/tests/integration/shell/call.py @@ -272,7 +272,7 @@ class CallTest(integration.ShellCase, testprogram.TestProgramCase, integration.S '--config-dir {0} --local cmd.run "echo foo"'.format( config_dir ), - timeout=15 + timeout=60 ) try: self.assertIn('local:', ret) @@ -295,7 +295,7 @@ class CallTest(integration.ShellCase, testprogram.TestProgramCase, integration.S '--config-dir {0} cmd.run "echo foo"'.format( config_dir ), - timeout=15 + timeout=60 ) self.assertIn('local:', ret) finally: @@ -325,7 +325,7 @@ class CallTest(integration.ShellCase, testprogram.TestProgramCase, integration.S '--config-dir {0} cmd.run "echo foo"'.format( config_dir ), - timeout=15, + timeout=60, catch_stderr=True, with_retcode=True ) diff --git a/tests/integration/shell/key.py b/tests/integration/shell/key.py index bf13fff9a3..aeba671829 100644 --- a/tests/integration/shell/key.py +++ b/tests/integration/shell/key.py @@ -265,7 +265,7 @@ class KeyTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn): '--config-dir {0} -L'.format( config_dir ), - timeout=15 + timeout=60 ) try: self.assertIn('minion', '\n'.join(ret)) diff --git a/tests/integration/shell/matcher.py b/tests/integration/shell/matcher.py index e1623ae1b2..2bc8e61220 100644 --- a/tests/integration/shell/matcher.py +++ b/tests/integration/shell/matcher.py @@ -353,7 +353,7 @@ class MatchTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn): '--config-dir {0} minion test.ping'.format( config_dir ), - timeout=15, + timeout=60, catch_stderr=True, with_retcode=True ) diff --git a/tests/integration/shell/runner.py b/tests/integration/shell/runner.py index 6d65d537b5..cf7257b93d 100644 --- a/tests/integration/shell/runner.py +++ b/tests/integration/shell/runner.py @@ -109,7 +109,7 @@ class RunTest(integration.ShellCase, testprogram.TestProgramCase, integration.Sh '--config-dir {0} -d'.format( config_dir ), - timeout=15, + timeout=60, catch_stderr=True, with_retcode=True ) -- 2.11.0