saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix windows tests - increase timeout

Browse source
This commit is contained in:
Ch3LL 2019-04-12 21:32:33 -04:00
parent c70772c5a0
commit 795a7f67da
No known key found for this signature in database
GPG key ID: 132B55A7C13EFA73
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/integration/client/test_kwarg.py
View file

@ -8,12 +8,16 @@ from tests.support.case import ModuleCase
# Import 3rd-party libs
from salt.ext import six
import salt.utils.platform
class StdTest(ModuleCase):
'''
Test standard client calls
'''
def setUp(self):
self.TIMEOUT = 600 if salt.utils.platform.is_windows() else 10
def test_cli(self):
'''
Test cli function
@ -84,6 +88,7 @@ class StdTest(ModuleCase):
'minion',
'test.arg_type',
['a', 1],
timeout=self.TIMEOUT,
kwarg={'outer': {'a': terrible_yaml_string},
'inner': 'value'}
)

6
tests/integration/client/test_standard.py
View file

@ -9,12 +9,15 @@ from tests.support.case import ModuleCase
# Import salt libs
import salt.utils.files
import salt.utils.platform
class StdTest(ModuleCase):
'''
Test standard client calls
'''
def setUp(self):
self.TIMEOUT = 600 if salt.utils.platform.is_windows() else 10
def test_cli(self):
'''
@ -159,7 +162,8 @@ class StdTest(ModuleCase):
ret = self.client.cmd(
'minion,ghostminion',
'test.ping',
tgt_type='list'
tgt_type='list',
timeout=self.TIMEOUT
)
self.assertIn('minion', ret)
self.assertIn('ghostminion', ret)