valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #36661 from cachedout/fix_grain_test_race

Browse Source 
Fix race between minion job timeout and cli test timeout
This commit is contained in:
Mike Place 2016-09-29 13:42:23 +09:00 committed by GitHub
commit 3249a11e71
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/grains.py
View File

@ -70,7 +70,7 @@ class GrainsTargetingTest(integration.ShellCase):
# ping disconnected minion and ensure it times out and returns with correct message
try:
ret = ''
for item in self.run_salt('-G \'id:disconnected\' test.ping'):
for item in self.run_salt('-t 1 -G \'id:disconnected\' test.ping', timeout=30):
if item != 'disconnected:':
ret = item.strip()
self.assertEqual(ret, test_ret)