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

Correct config test errors

Browse source
This commit is contained in:
Mike Place 2016-07-20 09:44:23 -06:00
parent 03039c13e2
commit ec8a6ebab3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/__init__.py
View file

@ -1015,7 +1015,7 @@ class TestDaemon(object):
minion_opts['user'] = running_tests_user
minion_opts['config_dir'] = TMP_CONF_DIR
minion_opts['root_dir'] = os.path.join(TMP, 'rootdir')
minion_opts['pki_dir'] = os.path.join(TMP, 'rootdir', 'pki', 'minion')
minion_opts['pki_dir'] = os.path.join(TMP, 'rootdir', 'pki')
# This sub_minion also connects to master
sub_minion_opts = salt.config._read_conf_file(os.path.join(CONF_DIR, 'sub_minion'))

4
tests/unit/config/config_test.py
View file

@ -324,8 +324,8 @@ class ConfigTestCase(TestCase, integration.AdaptedConfigurationTestCaseMixIn):
self.assertEqual(syndic_opts['master'], 'localhost')
self.assertEqual(syndic_opts['sock_dir'], os.path.join(root_dir, 'minion_sock'))
self.assertEqual(syndic_opts['cachedir'], os.path.join(root_dir, 'cache'))
self.assertEqual(syndic_opts['log_file'], os.path.join(root_dir, 'osyndic.log'))
self.assertEqual(syndic_opts['pidfile'], os.path.join(root_dir, 'osyndic.pid'))
self.assertEqual(syndic_opts['log_file'], os.path.join(root_dir, 'syndic.log'))
self.assertEqual(syndic_opts['pidfile'], os.path.join(root_dir, 'syndic.pid'))
# Show that the options of localclient that repub to local master
# are not merged with syndic ones
self.assertEqual(syndic_opts['_master_conf_file'], minion_conf_path)