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

Fix py3 managed.file test failure

Browse Source
This commit is contained in:
Daniel A. Wozniak 2019-01-22 10:46:32 -07:00
parent 537114cbc9
commit c1ea10f090
No known key found for this signature in database
GPG Key ID: 166B9D2C06C82D61
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/integration/states/test_file.py
View File

@ -2532,12 +2532,12 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
@with_tempfile()
def test_issue_50221(self, name):
expected = b'abc{0}{0}{0}'.format(os.linesep)
expected = 'abc{0}{0}{0}'.format(os.linesep)
ret = self.run_function(
'pillar.get',
['issue-50221']
)
assert ret.encode() == expected
assert ret == expected
ret = self.run_function(
'state.apply',
['issue-50221'],
@ -2546,7 +2546,7 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
},
)
self.assertSaltTrueReturn(ret)
with salt.utils.files.fopen(name, 'rb') as fp:
with salt.utils.files.fopen(name, 'r') as fp:
contents = fp.read()
assert contents == expected