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 51266_schedule_enable_disable_break_save

Browse Source
This commit is contained in:
Gareth J. Greenaway 2019-02-14 09:00:50 -08:00 committed by GitHub
commit fbacb35424
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/__init__.py
View File

@ -183,7 +183,7 @@ class TestDaemon(object):
''' '''
Set up the master and minion daemons, and run related cases Set up the master and minion daemons, and run related cases
''' '''
MINIONS_CONNECT_TIMEOUT = MINIONS_SYNC_TIMEOUT = 300 MINIONS_CONNECT_TIMEOUT = MINIONS_SYNC_TIMEOUT = 500
def __init__(self, parser): def __init__(self, parser):
self.parser = parser self.parser = parser

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

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