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

Update the mocked cloud configs to also include master configs

Browse Source 
The master configs are injected into the cloud configs, and we need
them here in order to get the `user` default for the parsers test.
This commit is contained in:
rallytime 2016-12-02 15:38:53 -07:00
parent f2c8cb13d0
commit 74a417e527
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit/utils/parsers_test.py
View File

@ -850,8 +850,12 @@ class SaltCloudParserTestCase(LogSettingsParserTests):
# Set mandatory CLI options # Set mandatory CLI options
self.args = ['-p', 'foo', 'bar'] self.args = ['-p', 'foo', 'bar']
# Set defaults # Set default configs
self.default_config = salt.config.DEFAULT_CLOUD_OPTS # Cloud configs are merged with master configs in
# config/__init__.py, so we'll do that here as well
# As we need the 'user' key later on.
self.default_config = salt.config.DEFAULT_MASTER_OPTS.copy()
self.default_config.update(salt.config.DEFAULT_CLOUD_OPTS)
# Log file # Log file
self.log_file = '/tmp/salt_cloud_parser_test' self.log_file = '/tmp/salt_cloud_parser_test'