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 #49182 from terminalmage/salt-jenkins-1078

Browse source 
Fix hanging syndic test
This commit is contained in:
Mike Place 2018-08-18 08:10:31 -04:00 • committed by GitHub
commit 134f125b96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/integration/__init__.py
View file

@ -742,6 +742,7 @@ class TestDaemon(object):
master_opts['config_dir'] = RUNTIME_VARS.TMP_CONF_DIR
master_opts['root_dir'] = os.path.join(TMP, 'rootdir')
master_opts['pki_dir'] = os.path.join(TMP, 'rootdir', 'pki', 'master')
master_opts['syndic_master'] = 'localhost'
# This is the syndic for master
# Let's start with a copy of the syndic master configuration