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

Sort list of minions in batch to make tests consistent

Browse Source
This commit is contained in:
Erik Johnson 2017-03-16 12:00:38 -05:00
parent 39a6392fa2
commit 3923305141
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/cli/batch.py
View File

@ -166,7 +166,7 @@ class Batch(object):
if next_:
if not self.quiet:
print_cli('\nExecuting run on {0}\n'.format(next_))
print_cli('\nExecuting run on {0}\n'.format(sorted(next_)))
# create a new iterator for this batch of minions
new_iter = self.local.cmd_iter_no_block(
*args,

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

@ -27,7 +27,7 @@ class BatchTest(integration.ShellCase):
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']"
ret = "Executing run on ['minion', 'sub_minion']"
cmd = self.run_salt('\'*\' test.ping --batch-size 2')
self.assertIn(ret, cmd)