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 #50530 from terminalmage/salt-jenkins-1209

Browse source 
Enable proxy/ssh daemons when filename mapping causes those tests to be run
This commit is contained in:
Nicole Thomas 2018-11-15 18:03:05 -05:00 • committed by GitHub
commit 46514818a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/support/parser/__init__.py
View file

@ -449,6 +449,14 @@ class SaltTestingParser(optparse.OptionParser):
ret.update(filename_map[path_expr])
break
if any(x.startswith('integration.proxy.') for x in ret):
# Ensure that the salt-proxy daemon is started for these tests.
self.options.proxy = True
if any(x.startswith('integration.ssh.') for x in ret):
# Ensure that an ssh daemon is started for these tests.
self.options.ssh = True
return ret
def parse_args(self, args=None, values=None):