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

Fix test_matcher on Windows

Browse source 
Fixes a timeout issue in test_salt_documentation_arguments_not_assumed
This commit is contained in:
twangboy 2018-11-02 14:30:31 -06:00 • committed by rallytime
parent e5f97cdce0
commit a696a8f564
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -339,17 +339,20 @@ class MatchTest(ShellCase, ShellCaseCommonTestsMixin):
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')
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 -t 20')
data = self.run_salt('"*" -d', timeout=timeout)
if data:
assert 'user.add:' in data
data = self.run_salt('"*" -d user -t 20')
data = self.run_salt('"*" -d user', timeout=timeout)
assert 'user.add:' in data
data = self.run_salt('"*" sys.doc -d user -t 20')
data = self.run_salt('"*" sys.doc -d user', timeout=timeout)
assert 'user.add:' in data
data = self.run_salt('"*" sys.doc user -t 20')
data = self.run_salt('"*" sys.doc user', timeout=timeout)
assert 'user.add:' in data
def test_salt_documentation_too_many_arguments(self):