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

Remove flaky test

Browse source
This commit is contained in:
twangboy 2018-11-05 12:15:06 -07:00 • committed by rallytime
parent a696a8f564
commit 60559cfa8a
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -329,32 +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.')
timeout = 20
if os_family == 'Windows':
timeout = 60
data = self.run_salt('-d', timeout=timeout)
if data:
assert 'user.add:' in data
data = self.run_salt('"*" -d', timeout=timeout)
if data:
assert 'user.add:' in data
data = self.run_salt('"*" -d user', timeout=timeout)
assert 'user.add:' in data
data = self.run_salt('"*" sys.doc -d user', timeout=timeout)
assert 'user.add:' in data
data = self.run_salt('"*" sys.doc user', timeout=timeout)
assert 'user.add:' in data
def test_salt_documentation_too_many_arguments(self):
'''
Test to see if passing additional arguments shows an error