Fix 50221 regression test on Windows

This commit is contained in:
Daniel A. Wozniak 2019-01-19 18:18:39 -07:00 committed by Ch3LL
parent 1840af9c00
commit 824950c4cd
No known key found for this signature in database
GPG key ID: 132B55A7C13EFA73

View file

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