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 pull request #33985 from rallytime/more-batch-tests

Browse Source 
Write some more simple batch command tests
This commit is contained in:
Mike Place 2016-06-13 17:38:05 -07:00 committed by GitHub
commit fa5efb6a69
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tests/integration/cli/batch.py
View File

@ -41,6 +41,54 @@ class BatchTest(integration.ShellCase):
cmd = sorted(self.run_salt('\'*\' test.echo \'batch testing\' -b 50%'))
self.assertListEqual(cmd, ret)
def test_batch_run_number(self):
'''
Tests executing a simple batch command using a number division instead of
a percentage with full batch CLI call.
'''
ret = ['',
"Executing run on ['sub_minion', 'minion']",
'',
'retcode:',
' 0',
'sub_minion:',
' True',
'minion:',
' True',
'retcode:',
' 0']
cmd = sorted(self.run_salt('\'*\' test.ping --batch-size 2'))
self.assertListEqual(cmd, sorted(ret))
def test_batch_run_grains_targeting(self):
'''
Tests executing a batch command using a percentage divisor as well as grains
targeting.
'''
os_grain = ''
ret = ['',
"Executing run on ['sub_minion']",
'',
'retcode:',
' 0',
'sub_minion:',
' True',
'',
"Executing run on ['minion']",
'',
'minion:',
' True',
'retcode:',
' 0']
for item in self.run_salt('minion grains.get os'):
if item != 'minion':
os_grain = item
os_grain = os_grain.strip()
cmd = sorted(self.run_salt('-G \'os:{0}\' -b 25% test.ping'.format(os_grain)))
self.assertListEqual(cmd, sorted(ret))
if __name__ == '__main__':
from integration import run_tests