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

fix tests for file.blockplace to remove newline (#33082)

Browse Source
This commit is contained in:
Megan Wilhite 2016-05-06 08:44:20 -06:00 committed by Nicole Thomas
parent fb89877cf2
commit 2c6326f14a
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/integration/states/file.py
View File

@ -1563,12 +1563,10 @@ class FileTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn):
self.assertEqual(
['#-- start salt managed zonestart -- PLEASE, DO NOT EDIT',
'foo',
'',
'#-- end salt managed zonestart --',
'#',
'#-- start salt managed zoneend -- PLEASE, DO NOT EDIT',
'bar',
'',
'#-- end salt managed zoneend --',
''],
contents
@ -1633,7 +1631,6 @@ class FileTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn):
'bar',
'',
'baz',
'',
'#-- end managed zone',
''],
contents

10
tests/unit/modules/file_test.py
View File

@ -257,7 +257,7 @@ class FileBlockReplaceTestCase(TestCase):
)
with salt.utils.fopen(self.tfile.name, 'r') as fp:
self.assertNotIn('#-- START BLOCK 2'
+ "\n" + new_content + "\n"
+ "\n" + new_content
+ '#-- END BLOCK 2', fp.read())
filemod.blockreplace(self.tfile.name,
@ -270,7 +270,7 @@ class FileBlockReplaceTestCase(TestCase):
with salt.utils.fopen(self.tfile.name, 'r') as fp:
self.assertIn('#-- START BLOCK 2'
+ "\n" + new_content
+ "\n" + '#-- END BLOCK 2', fp.read())
+ '#-- END BLOCK 2', fp.read())
def test_replace_append_newline_at_eof(self):
'''
@ -284,7 +284,7 @@ class FileBlockReplaceTestCase(TestCase):
'content': 'baz',
'append_if_not_found': True,
}
block = '{marker_start}\n{content}\n{marker_end}\n'.format(**args)
block = '{marker_start}\n{content}{marker_end}\n'.format(**args)
expected = base + '\n' + block
# File ending with a newline
with tempfile.NamedTemporaryFile(mode='w+') as tfile:
@ -322,7 +322,7 @@ class FileBlockReplaceTestCase(TestCase):
with salt.utils.fopen(self.tfile.name, 'r') as fp:
self.assertNotIn(
'#-- START BLOCK 2' + "\n"
+ new_content + "\n" + '#-- END BLOCK 2',
+ new_content + '#-- END BLOCK 2',
fp.read())
filemod.blockreplace(self.tfile.name,
@ -336,7 +336,7 @@ class FileBlockReplaceTestCase(TestCase):
fp.read().startswith(
'#-- START BLOCK 2'
+ "\n" + new_content
+ "\n" + '#-- END BLOCK 2'))
+ '#-- END BLOCK 2'))
def test_replace_partial_marked_lines(self):
filemod.blockreplace(self.tfile.name,