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

fix diff unit test while creating text file

Browse Source
This commit is contained in:
Pablo Suárez Hernández 2016-07-11 16:15:11 +01:00
parent 06ef54a258
commit 964d5cbf03
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/unit/modules/snapper_test.py
View File

@ -65,12 +65,10 @@ FILE_CONTENT = {
"post": "another foobar"
},
'/tmp/foo2': {
"pre": "",
"post": "another foobar"
}
}
MODULE_RET = {
'SNAPSHOTS': [
{
@ -277,13 +275,12 @@ class SnapperTestCase(TestCase):
@patch('salt.modules.snapper.snapper.UmountSnapshot', MagicMock(return_value=""))
@patch('salt.modules.snapper.changed_files', MagicMock(return_value=["/tmp/foo", "/tmp/foo2"]))
@patch('salt.modules.snapper._is_text_file', MagicMock(return_value=True))
@patch('os.path.isfile', MagicMock(side_effect=[True, True, True, True]))
@patch('os.path.isfile', MagicMock(side_effect=[True, True, False, True]))
@patch('os.path.isdir', MagicMock(return_value=False))
def test_diff_text_files(self):
fopen_effect = [
mock_open(read_data=FILE_CONTENT["/tmp/foo"]['pre']).return_value,
mock_open(read_data=FILE_CONTENT["/tmp/foo"]['post']).return_value,
mock_open(read_data=FILE_CONTENT["/tmp/foo2"]['pre']).return_value,
mock_open(read_data=FILE_CONTENT["/tmp/foo2"]['post']).return_value,
]
with patch('salt.utils.fopen') as fopen_mock: