saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Lint fix from sloppy merge conflict resolution

Browse source
This commit is contained in:
rallytime 2017-10-25 11:58:44 -04:00
parent 1c3cb5c6a4
commit 055b0701de
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/unit/states/test_file.py
View file

@ -814,8 +814,8 @@ class TestFileState(TestCase, LoaderModuleMockMixin):
ret.update({
'comment': comt,
'result': None,
'pchanges': p_chg
'changes': {'/etc/grub.conf': {'directory': 'new'}}})
'pchanges': p_chg,
'changes': {'/etc/grub.conf': {'directory': 'new'}}
})
self.assertDictEqual(filestate.directory(name,
user=user,