mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #32295 from rallytime/test-cloud-deploy-dir
Test the contents of 'deploy_scripts_search_path' in salt.config.cloud_config
This commit is contained in:
commit
edbab99164
1 changed files with 22 additions and 0 deletions
|
@ -465,6 +465,28 @@ class ConfigTestCase(TestCase, integration.AdaptedConfigurationTestCaseMixIn):
|
|||
self.assertRaises(SaltCloudConfigError, sconfig.cloud_config, PATH,
|
||||
providers_config_path='bar')
|
||||
|
||||
@patch('os.path.isdir', MagicMock(return_value=True))
|
||||
def test_cloud_config_deploy_scripts_search_path(self):
|
||||
'''
|
||||
Tests the contents of the 'deploy_scripts_search_path' tuple to ensure that
|
||||
the correct deploy search paths are present.
|
||||
|
||||
There should be two search paths reported in the tuple: ``/etc/salt/cloud.deploy.d``
|
||||
and ``<path-to-salt-install>/salt/cloud/deploy``. The first element is usually
|
||||
``/etc/salt/cloud.deploy.d``, but sometimes is can be something like
|
||||
``/etc/local/salt/cloud.deploy.d``, so we'll only test against the last part of
|
||||
the path.
|
||||
'''
|
||||
search_paths = sconfig.cloud_config('/etc/salt/cloud').get('deploy_scripts_search_path')
|
||||
etc_deploy_path = '/salt/cloud.deploy.d'
|
||||
deploy_path = '/salt/cloud/deploy'
|
||||
|
||||
# Check cloud.deploy.d path is the first element in the search_paths tuple
|
||||
self.assertTrue(search_paths[0].endswith(etc_deploy_path))
|
||||
|
||||
# Check the second element in the search_paths tuple
|
||||
self.assertTrue(search_paths[1].endswith(deploy_path))
|
||||
|
||||
# apply_cloud_config tests
|
||||
|
||||
def test_apply_cloud_config_no_provider_detail_list(self):
|
||||
|
|
Loading…
Add table
Reference in a new issue