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

Use double quotes on windows commands

Browse source
This commit is contained in:
Daniel A. Wozniak 2018-08-26 06:31:14 +00:00
parent 0394ece642
commit 2733c02b0a
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/integration/cli/test_batch.py
View file

@ -4,6 +4,7 @@
'''
# Import Python libs
from __future__ import absolute_import
import salt.utils
# Import Salt Testing Libs
from tests.support.case import ShellCase
@ -19,7 +20,10 @@ class BatchTest(ShellCase):
Tests executing a simple batch command to help catch regressions
'''
ret = 'Executing run on [\'sub_minion\']'
cmd = self.run_salt('\'*\' test.echo \'batch testing\' -b 50%')
if salt.utils.is_windows():
cmd = self.run_salt('"*minion" test.echo "batch testing" -b 50%')
else:
cmd = self.run_salt('\'*minion\' test.echo \'batch testing\' -b 50%')
self.assertIn(ret, cmd)
def test_batch_run_number(self):
@ -28,7 +32,10 @@ class BatchTest(ShellCase):
a percentage with full batch CLI call.
'''
ret = "Executing run on ['minion', 'sub_minion']"
cmd = self.run_salt('\'*\' test.ping --batch-size 2')
if salt.utils.is_windows():
cmd = self.run_salt('"*minion" test.ping --batch-size 2')
else:
cmd = self.run_salt('\'*minion\' test.ping --batch-size 2')
self.assertIn(ret, cmd)
def test_batch_run_grains_targeting(self):
@ -45,7 +52,10 @@ class BatchTest(ShellCase):
os_grain = item
os_grain = os_grain.strip()
cmd = self.run_salt('-G \'os:{0}\' -b 25% test.ping'.format(os_grain))
if salt.utils.is_windows():
cmd = self.run_salt('-C "G@os:{0} and not localhost" -b 25% test.ping'.format(os_grain))
else:
cmd = self.run_salt('-C \'G@os:{0} and not localhost\' -b 25% test.ping'.format(os_grain))
self.assertIn(sub_min_ret, cmd)
self.assertIn(min_ret, cmd)

21
tests/integration/cli/test_grains.py
View file

@ -40,17 +40,26 @@ class GrainsTargetingTest(ShellCase):
if item != 'minion:':
os_grain = item.strip()
ret = self.run_salt('-G \'os:{0}\' test.ping'.format(os_grain))
if salt.utils.is_windows():
ret = self.run_salt('-G "os:{0}" test.ping'.format(os_grain))
else:
ret = self.run_salt('-G \'os:{0}\' test.ping'.format(os_grain))
self.assertEqual(sorted(ret), sorted(test_ret))
def test_grains_targeting_minion_id_running(self):
'''
Tests return of each running test minion targeting with minion id grain
'''
minion = self.run_salt('-G \'id:minion\' test.ping')
if salt.utils.is_windows():
minion = self.run_salt('-G "id:minion" test.ping')
else:
minion = self.run_salt('-G \'id:minion\' test.ping')
self.assertEqual(sorted(minion), sorted(['minion:', ' True']))
sub_minion = self.run_salt('-G \'id:sub_minion\' test.ping')
if salt.utils.is_windows():
sub_minion = self.run_salt('-G "id:sub_minion" test.ping')
else:
sub_minion = self.run_salt('-G \'id:sub_minion\' test.ping')
self.assertEqual(sorted(sub_minion), sorted(['sub_minion:', ' True']))
@flaky
@ -68,8 +77,12 @@ class GrainsTargetingTest(ShellCase):
# ping disconnected minion and ensure it times out and returns with correct message
try:
if salt.utils.is_windows():
cmd_str = '-t 1 -G "id:disconnected" test.ping'
else:
cmd_str = '-t 1 -G \'id:disconnected\' test.ping'
ret = ''
for item in self.run_salt('-t 1 -G \'id:disconnected\' test.ping', timeout=40):
for item in self.run_salt(cmd_str, timeout=40):
if item != 'disconnected:':
ret = item.strip()
assert ret == test_ret