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

Merge pull request #32419 from jtand/file_state_test_fix

Browse Source 
Fixes test failure where Fedora 23 has /etc/grub.conf by default
This commit is contained in:
Nicole Thomas 2016-04-07 16:15:51 -06:00
commit c712fbed37
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/unit/states/file_test.py
View File

@ -199,13 +199,14 @@ class FileTestCase(TestCase):
'file.is_link': mock_f}):
with patch.dict(filestate.__opts__, {'test': False}):
with patch.object(os.path, 'isdir', mock_f):
comt = ('Directory /etc for symlink is not present')
ret.update({'comment': comt,
'result': False,
'pchanges': {'new': '/etc/grub.conf'}})
self.assertDictEqual(filestate.symlink(name, target,
user=user,
group=group), ret)
with patch.object(os.path, 'exists', mock_f):
comt = ('Directory /etc for symlink is not present')
ret.update({'comment': comt,
'result': False,
'pchanges': {'new': '/etc/grub.conf'}})
self.assertDictEqual(filestate.symlink(name, target,
user=user,
group=group), ret)
with patch.dict(filestate.__salt__, {'config.manage_mode': mock_t,
'file.user_to_uid': mock_uid,