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

Merge pull request #22985 from jfindlay/apache_state_test

Browse Source 
fix failing apache state unit test
This commit is contained in:
Nicole Thomas 2015-04-23 09:18:23 -06:00
commit cf9041744a
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/unit/states/apache_test.py
View File

@ -39,28 +39,34 @@ class ApacheTestCase(TestCase):
Test to allows for inputting a yaml dictionary into a file
for apache configuration files.
'''
name = 'yaml'
name = '/etc/distro/specific/apache.conf'
config = 'VirtualHost: this: "*:80"'
new_config = 'LiteralHost: that: "*:79"'
ret = {'name': name,
'result': True,
'changes': {},
'comment': ''}
mock = MagicMock(side_effect=[config, '', ''])
with patch.object(salt.utils, 'fopen', mock_open(read_data=config)):
with patch.dict(apache.__salt__,
{'apache.config': mock}):
mock_config = MagicMock(return_value=config)
with patch.dict(apache.__salt__, {'apache.config': mock_config}):
ret.update({'comment': 'Configuration is up to date.'})
self.assertDictEqual(apache.configfile(name, config), ret)
with patch.object(salt.utils, 'fopen', mock_open(read_data=config)):
mock_config = MagicMock(return_value=new_config)
with patch.dict(apache.__salt__, {'apache.config': mock_config}):
ret.update({'comment': 'Configuration will update.',
'changes': {'new': '',
'old': 'VirtualHost: this: "*:80"'},
'changes': {'new': new_config,
'old': config},
'result': None})
with patch.dict(apache.__opts__, {'test': True}):
self.assertDictEqual(apache.configfile(name, config), ret)
self.assertDictEqual(apache.configfile(name, new_config), ret)
with patch.object(salt.utils, 'fopen', mock_open(read_data=config)):
mock_config = MagicMock(return_value=new_config)
with patch.dict(apache.__salt__, {'apache.config': mock_config}):
ret.update({'comment': 'Successfully created configuration.',
'result': True})
with patch.dict(apache.__opts__, {'test': False}):