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

Merge pull request #50493 from rallytime/bp-50362

Browse source 
Back-port #50362 to 2017.7
This commit is contained in:
Nicole Thomas 2018-11-13 11:59:50 -05:00 • committed by GitHub
commit c00fd43ee9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/integration/shell/test_matcher.py
View file

@ -329,29 +329,6 @@ class MatchTest(ShellCase, ShellCaseCommonTestsMixin):
data = self.run_salt('-d "*" user')
self.assertIn('user.add:', data)
@flaky
def test_salt_documentation_arguments_not_assumed(self):
'''
Test to see if we're not auto-adding '*' and 'sys.doc' to the call
'''
os_family = self.run_call('--local grains.get os_family')[1].strip()
if os_family == 'Arch':
self.skipTest('This test is failing in Arch due to a bug in salt-testing. '
'Skipping until salt-testing can be upgraded. For more information, '
'see https://github.com/saltstack/salt-jenkins/issues/324.')
data = self.run_salt('-d -t 20')
if data:
assert 'user.add:' in data
data = self.run_salt('"*" -d -t 20')
if data:
assert 'user.add:' in data
data = self.run_salt('"*" -d user -t 20')
assert 'user.add:' in data
data = self.run_salt('"*" sys.doc -d user -t 20')
assert 'user.add:' in data
data = self.run_salt('"*" sys.doc user -t 20')
assert 'user.add:' in data
def test_salt_documentation_too_many_arguments(self):
'''
Test to see if passing additional arguments shows an error