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

Update test to match how file.append works

Browse source
This commit is contained in:
Erik Johnson 2017-12-19 15:34:31 -06:00
parent 4501d0d6f9
commit e65237c390
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/unit/modules/test_file.py
View file

@ -567,8 +567,8 @@ class FileModuleTestCase(TestCase, LoaderModuleMockMixin):
newlines at end of file.
'''
# File ending with a newline
with tempfile.NamedTemporaryFile(mode='w+b', delete=False) as tfile:
tfile.write(salt.utils.stringutils.to_bytes('foo' + os.linesep))
with tempfile.NamedTemporaryFile(mode='w', delete=False) as tfile:
tfile.write(salt.utils.stringutils.to_str('foo' + os.linesep))
tfile.flush()
filemod.append(tfile.name, 'bar')
expected = os.linesep.join(['foo', 'bar']) + os.linesep
@ -577,8 +577,8 @@ class FileModuleTestCase(TestCase, LoaderModuleMockMixin):
salt.utils.stringutils.to_unicode(tfile2.read()), expected)
# File not ending with a newline
with tempfile.NamedTemporaryFile(mode='w+b', delete=False) as tfile:
tfile.write(salt.utils.stringutils.to_bytes('foo'))
with tempfile.NamedTemporaryFile(mode='w', delete=False) as tfile:
tfile.write(salt.utils.stringutils.to_str('foo'))
tfile.flush()
filemod.append(tfile.name, 'bar')
with salt.utils.files.fopen(tfile.name) as tfile2:
@ -586,8 +586,8 @@ class FileModuleTestCase(TestCase, LoaderModuleMockMixin):
salt.utils.stringutils.to_unicode(tfile2.read()), expected)
# A newline should be added in empty files
with tempfile.NamedTemporaryFile(mode='w+b', delete=False) as tfile:
filemod.append(tfile.name, salt.utils.stringutils.to_bytes('bar'))
with tempfile.NamedTemporaryFile(mode='w', delete=False) as tfile:
filemod.append(tfile.name, salt.utils.stringutils.to_str('bar'))
with salt.utils.files.fopen(tfile.name) as tfile2:
self.assertEqual(
salt.utils.stringutils.to_unicode(tfile2.read()),