valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adding some timeouts to see if it helps the tests pass on OS X.

Browse Source
This commit is contained in:
Gareth J. Greenaway 2019-06-12 20:18:05 -07:00
parent fd0ba0aea9
commit 1741bb053b
No known key found for this signature in database
GPG Key ID: 10B62F8A7CAD7A41
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/states/test_file.py
View File

@ -2346,7 +2346,7 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
with salt.utils.files.fopen(template_path, 'w') as fp_:
fp_.write(os.linesep.join(sls_template).format(testcase_filedest))
ret = self.run_function('state.sls', mods='issue-11003')
ret = self.run_function('state.sls', mods='issue-11003', timeout=600)
for name, step in six.iteritems(ret):
self.assertSaltTrueReturn({name: step})
with salt.utils.files.fopen(testcase_filedest) as fp_:

2
tests/integration/states/test_pip_state.py
View File

@ -514,7 +514,7 @@ class PipStateTest(ModuleCase, SaltReturnAssertsMixin):
false_cmd = 'exit 1 >nul'
try:
ret = self.run_state(
'pip.installed', name='pep8', bin_env=venv_dir, unless=false_cmd
'pip.installed', name='pep8', bin_env=venv_dir, unless=false_cmd, timeout=600
)
self.assertSaltTrueReturn(ret)
self.assertNotIn('warnings', next(six.itervalues(ret)))