valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #50902 from dwoz/shell_case_timeouts

Browse Source 
Increase and standardize ShellCase timeouts
This commit is contained in:
Daniel Wozniak 2018-12-18 16:29:11 -07:00 committed by GitHub
commit abf55a2b68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/support/case.py
View File

@ -480,6 +480,7 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi
_code_dir_ = CODE_DIR
_script_dir_ = SCRIPT_DIR
_python_executable_ = PYEXEC
RUN_TIMEOUT = 500
def chdir(self, dirname):
try:
@ -487,7 +488,8 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi
except OSError:
os.chdir(INTEGRATION_TEST_DIR)
def run_salt(self, arg_str, with_retcode=False, catch_stderr=False, timeout=90, popen_kwargs=None): # pylint: disable=W0221
def run_salt(self, arg_str, with_retcode=False, catch_stderr=False, # pylint: disable=W0221
timeout=RUN_TIMEOUT, popen_kwargs=None):
'''
Execute salt
'''
@ -501,7 +503,7 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi
log.debug('Result of run_salt for command \'%s\': %s', arg_str, ret)
return ret
def run_spm(self, arg_str, with_retcode=False, catch_stderr=False, timeout=60): # pylint: disable=W0221
def run_spm(self, arg_str, with_retcode=False, catch_stderr=False, timeout=RUN_TIMEOUT): # pylint: disable=W0221
'''
Execute spm
'''
@ -514,7 +516,7 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi
return ret
def run_ssh(self, arg_str, with_retcode=False, catch_stderr=False, # pylint: disable=W0221
timeout=60, wipe=True, raw=False):
timeout=RUN_TIMEOUT, wipe=True, raw=False):
'''
Execute salt-ssh
'''
@ -535,7 +537,7 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi
return ret
def run_run(self, arg_str, with_retcode=False, catch_stderr=False,
asynchronous=False, timeout=180, config_dir=None, **kwargs):
asynchronous=False, timeout=RUN_TIMEOUT, config_dir=None, **kwargs):
'''
Execute salt-run
'''
@ -592,7 +594,8 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi
fun, opts_arg, ret)
return ret
def run_key(self, arg_str, catch_stderr=False, with_retcode=False):
def run_key(self, arg_str, catch_stderr=False, with_retcode=False, # pylint: disable=W0221
timeout=RUN_TIMEOUT):
'''
Execute salt-key
'''
@ -601,11 +604,12 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi
arg_str,
catch_stderr=catch_stderr,
with_retcode=with_retcode,
timeout=60)
timeout=timeout)
log.debug('Result of run_key for command \'%s\': %s', arg_str, ret)
return ret
def run_cp(self, arg_str, with_retcode=False, catch_stderr=False):
def run_cp(self, arg_str, with_retcode=False, catch_stderr=False, # pylint: disable=W0221
timeout=RUN_TIMEOUT):
'''
Execute salt-cp
'''
@ -616,9 +620,10 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi
arg_str,
with_retcode=with_retcode,
catch_stderr=catch_stderr,
timeout=60)
timeout=timeout)
def run_call(self, arg_str, with_retcode=False, catch_stderr=False, local=False):
def run_call(self, arg_str, with_retcode=False, catch_stderr=False, # pylint: disable=W0221
local=False, timeout=RUN_TIMEOUT):
'''
Execute salt-call.
'''
@ -628,11 +633,11 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi
arg_str,
with_retcode=with_retcode,
catch_stderr=catch_stderr,
timeout=60)
timeout=timeout)
log.debug('Result of run_call for command \'%s\': %s', arg_str, ret)
return ret
def run_cloud(self, arg_str, catch_stderr=False, timeout=30):
def run_cloud(self, arg_str, catch_stderr=False, timeout=RUN_TIMEOUT):
'''
Execute salt-cloud
'''