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

Skip the correct test for the matcher tests in Arch

Browse Source 
I mixed up the test that was actually failing for Arch. I originally
submitted #41074 to skip the test_salt_documentation test in the
shell matcher tests. This is the wrong test to skip.

I reverted the previous commit, and applied the skipTest to the
correct test that is failing on Arch, which is the
test_salt_documentation_arguments_not_assumed test.
This commit is contained in:
rallytime 2017-05-04 14:45:58 -06:00
parent b9d1ce9aed
commit da811fe505
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/integration/shell/matcher.py
View File

@ -312,6 +312,11 @@ class MatchTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
'''
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:
self.assertIn('user.add:', data)