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 branch '2018.3' into increase_wait_2018.3

Browse Source
This commit is contained in:
Shane Lee 2019-02-14 09:31:14 -07:00 committed by GitHub
commit 9c964efa5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/cli/test_batch.py
View File

@ -17,7 +17,7 @@ class BatchTest(ShellCase):
Integration tests for the salt.cli.batch module
'''
if salt.utils.platform.is_windows():
run_timeout = 90
run_timeout = 180
else:
run_timeout = 30