valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the mocked contents pillar file state tests.

Browse Source
This commit is contained in:
Pedro Algarvio 2013-11-12 07:55:03 +00:00
parent 54fc502de0
commit 55e0290da6
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,6 @@ class TestFileState(TestCase):
returner.returned = contents
returner.returned = None
filestate.__salt__ = {
'file.manage_file': returner
}
@ -80,9 +79,7 @@ class TestFileState(TestCase):
self.run_contents_pillar(pillar_value, expected=pillar_value)
def run_contents_pillar(self, pillar_value, expected):
def returner(contents, *args, **kwargs):
returner.returned = (contents, args, kwargs)
returner.returned = None
returner = MagicMock(return_value=None)
filestate.__salt__ = {
'file.manage_file': returner
@ -109,7 +106,7 @@ class TestFileState(TestCase):
self.assertEqual(None, ret)
# make sure the value is correct
self.assertEqual(expected, returner.returned[1][-1])
self.assertEqual(expected, returner.call_args[0][-2])
if __name__ == '__main__':
from integration import run_tests