Merge branch '2018.3.4' into fix-pr-50417

This commit is contained in:
Pedro Algarvio 2019-01-25 09:29:31 +00:00 committed by GitHub
commit 4be2891855
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -775,10 +775,15 @@ class TestFileState(TestCase, LoaderModuleMockMixin):
with patch.object(os.path, 'exists', mock_t):
with patch.dict(filestate.__opts__, {'test': True}):
ret.update({'comment': comt})
self.assertDictEqual(filestate.managed
(name, user=user,
group=group,
mode=400), ret)
if salt.utils.is_windows():
self.assertDictEqual(filestate.managed
(name, user=user,
group=group), ret)
else:
self.assertDictEqual(filestate.managed
(name, user=user,
group=group,
mode=400), ret)
# 'directory' function tests: 1