valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix paths

Browse Source
This commit is contained in:
twangboy 2017-06-27 16:43:54 -06:00
parent 4209be843d
commit 1f497d8f78
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/unit/config/test_api.py
View File

@ -18,12 +18,19 @@ from tests.support.mock import (
# Import Salt libs # Import Salt libs
import salt.config import salt.config
import salt.utils
MOCK_MASTER_DEFAULT_OPTS = { MOCK_MASTER_DEFAULT_OPTS = {
'log_file': '/var/log/salt/master', 'log_file': '/var/log/salt/master',
'pidfile': '/var/run/salt-master.pid', 'pidfile': '/var/run/salt-master.pid',
'root_dir': '/' 'root_dir': '/'
} }
if salt.utils.is_windows():
MOCK_MASTER_DEFAULT_OPTS = {
'log_file': 'c:\\salt\\var\\log\\salt\\master',
'pidfile': 'c:\\salt\\var\\run\\salt-master.pid',
'root_dir': 'c:\\salt'
}
@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(NO_MOCK, NO_MOCK_REASON)
@ -39,8 +46,13 @@ class APIConfigTestCase(TestCase):
the DEFAULT_API_OPTS 'api_logfile' value. the DEFAULT_API_OPTS 'api_logfile' value.
''' '''
with patch('salt.config.client_config', MagicMock(return_value=MOCK_MASTER_DEFAULT_OPTS)): with patch('salt.config.client_config', MagicMock(return_value=MOCK_MASTER_DEFAULT_OPTS)):
expected = '/var/log/salt/api'
if salt.utils.is_windows():
expected = 'c:\\salt\\var\\log\\salt\\api'
ret = salt.config.api_config('/some/fake/path') ret = salt.config.api_config('/some/fake/path')
self.assertEqual(ret['log_file'], '/var/log/salt/api') self.assertEqual(ret['log_file'], expected)
def test_api_config_pidfile_values(self): def test_api_config_pidfile_values(self):
''' '''
@ -49,8 +61,13 @@ class APIConfigTestCase(TestCase):
the DEFAULT_API_OPTS 'api_pidfile' value. the DEFAULT_API_OPTS 'api_pidfile' value.
''' '''
with patch('salt.config.client_config', MagicMock(return_value=MOCK_MASTER_DEFAULT_OPTS)): with patch('salt.config.client_config', MagicMock(return_value=MOCK_MASTER_DEFAULT_OPTS)):
expected = '/var/run/salt-api.pid'
if salt.utils.is_windows():
expected = 'c:\\salt\\var\\run\\salt-api.pid'
ret = salt.config.api_config('/some/fake/path') ret = salt.config.api_config('/some/fake/path')
self.assertEqual(ret['pidfile'], '/var/run/salt-api.pid') self.assertEqual(ret['pidfile'], expected)
@destructiveTest @destructiveTest
def test_master_config_file_overrides_defaults(self): def test_master_config_file_overrides_defaults(self):
@ -64,6 +81,10 @@ class APIConfigTestCase(TestCase):
foo_dir = '/foo/bar/baz' foo_dir = '/foo/bar/baz'
hello_dir = '/hello/world' hello_dir = '/hello/world'
if salt.utils.is_windows():
foo_dir = 'c:\\foo\\bar\\baz'
hello_dir = 'c:\\hello\\world'
mock_master_config = { mock_master_config = {
'api_pidfile': foo_dir, 'api_pidfile': foo_dir,
'api_logfile': hello_dir, 'api_logfile': hello_dir,
@ -100,6 +121,11 @@ class APIConfigTestCase(TestCase):
mock_master_config = MOCK_MASTER_DEFAULT_OPTS.copy() mock_master_config = MOCK_MASTER_DEFAULT_OPTS.copy()
mock_master_config['root_dir'] = '/mock/root/' mock_master_config['root_dir'] = '/mock/root/'
if salt.utils.is_windows():
mock_log = 'c:\\mock\\root\\var\\log\\salt\\api'
mock_pid = 'c:\\mock\\root\\var\\run\\salt-api.pid'
mock_master_config['root_dir'] = 'c:\\mock\\root'
with patch('salt.config.client_config', with patch('salt.config.client_config',
MagicMock(return_value=mock_master_config)): MagicMock(return_value=mock_master_config)):
ret = salt.config.api_config('/some/fake/path') ret = salt.config.api_config('/some/fake/path')