valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #38885 from meaksh/2016.11-fix-tests-issues

Browse Source 
Increasing timeouts for running integrations tests
This commit is contained in:
Mike Place 2017-01-23 11:59:49 -07:00 committed by GitHub
commit 41a3055213
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/integration/__init__.py
View File

@ -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
'''

2
tests/integration/runners/state.py
View File

@ -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)

6
tests/integration/shell/call.py
View File

@ -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
)

2
tests/integration/shell/key.py
View File

@ -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))

2
tests/integration/shell/matcher.py
View File

@ -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
)

2
tests/integration/shell/runner.py
View File

@ -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
)