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

Increase timeout for test_kwarg tests

Browse source
This commit is contained in:
Ch3LL 2019-04-15 17:32:57 -04:00
parent 2c3ff2fc98
commit 3442202bb4
No known key found for this signature in database
GPG key ID: 132B55A7C13EFA73
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,6 +73,7 @@ class StdTest(ModuleCase):
'minion',
'test.arg',
['foo', 'bar', 'baz'],
timeout=self.TIMEOUT,
kwarg={'qux': 'quux'}
)
data = ret['minion']['ret']
@ -99,7 +100,9 @@ class StdTest(ModuleCase):
self.assertIn(six.text_type.__name__, data['kwargs']['inner'])
def test_full_return_kwarg(self):
ret = self.client.cmd('minion', 'test.ping', full_return=True)
ret = self.client.cmd(
'minion', 'test.ping', full_return=True, timeout=self.TIMEOUT,
)
for mid, data in ret.items():
self.assertIn('retcode', data)
@ -112,8 +115,10 @@ class StdTest(ModuleCase):
],
kwarg={
'quux': 'Quux',
})
},
timeout=self.TIMEOUT,
)
self.assertEqual(ret['minion'], {
'args': ['foo'],
'kwargs': {

3
tests/integration/modules/test_state.py
View file

@ -13,7 +13,7 @@ import time
# Import Salt Testing libs
from tests.support.case import ModuleCase
from tests.support.helpers import with_tempdir
from tests.support.helpers import with_tempdir, flaky
from tests.support.unit import skipIf
from tests.support.paths import BASE_FILES, TMP, TMP_PILLAR_TREE
from tests.support.mixins import SaltReturnAssertsMixin
@ -1762,6 +1762,7 @@ class StateModuleTest(ModuleCase, SaltReturnAssertsMixin):
with salt.utils.files.fopen(testfile, 'a'):
pass
@flaky
def test_retry_option_eventual_success(self):
'''
test a state with the retry option that should return True after at least 4 retry attmempt