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

Add back the try/finally blocks

Browse source
This commit is contained in:
twangboy 2017-09-14 10:30:07 -06:00
parent d7241d004f
commit 187bc1e61e
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 46 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
tests/integration/states/test_file.py
View file

@ -1606,34 +1606,37 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
if os.path.isfile(name):
self.run_function('file.remove', [name])
# Non existing file get's touched
ret = self.run_state(
'file.append', name=name, text='cheese', makedirs=True
)
self.assertSaltTrueReturn(ret)
if os.path.isfile(name):
self.run_function('file.remove', [name])
try:
# Non existing file get's touched
ret = self.run_state(
'file.append', name=name, text='cheese', makedirs=True
)
self.assertSaltTrueReturn(ret)
finally:
if os.path.isfile(name):
self.run_function('file.remove', [name])
# Nested directory and file get's touched
name = os.path.join(TMP, 'issue_1864', fname)
ret = self.run_state(
'file.append', name=name, text='cheese', makedirs=True
)
self.assertSaltTrueReturn(ret)
if os.path.isfile(name):
self.run_function('file.remove', [name])
try:
ret = self.run_state(
'file.append', name=name, text='cheese', makedirs=True
)
self.assertSaltTrueReturn(ret)
finally:
if os.path.isfile(name):
self.run_function('file.remove', [name])
# Parent directory exists but file does not and makedirs is False
ret = self.run_state(
'file.append', name=name, text='cheese'
)
self.assertSaltTrueReturn(ret)
self.assertTrue(os.path.isfile(name))
self.run_function('file.remove', [os.path.join(TMP, 'issue_1864')])
try:
ret = self.run_state(
'file.append', name=name, text='cheese'
)
self.assertSaltTrueReturn(ret)
self.assertTrue(os.path.isfile(name))
finally:
self.run_function('file.remove', [os.path.join(TMP, 'issue_1864')])
def test_prepend_issue_27401_makedirs(self):
'''
@ -1964,29 +1967,30 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
fp_.write(
os.linesep.join(sls_template).format(testcase_filedest))
ret = self.run_function('state.sls', mods='issue-8343')
for name, step in six.iteritems(ret):
self.assertSaltTrueReturn({name: step})
try:
ret = self.run_function('state.sls', mods='issue-8343')
for name, step in six.iteritems(ret):
self.assertSaltTrueReturn({name: step})
with salt.utils.fopen(testcase_filedest) as fp_:
contents = fp_.read().split(os.linesep)
with salt.utils.fopen(testcase_filedest) as fp_:
contents = fp_.read().split(os.linesep)
expected = [
'#-- 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 --',
'']
expected = [
'#-- 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 --',
'']
self.assertEqual(expected, contents)
if os.path.isdir(testcase_filedest):
os.unlink(testcase_filedest)
for filename in glob.glob('{0}.bak*'.format(testcase_filedest)):
os.unlink(filename)
self.assertEqual(expected, contents)
finally:
if os.path.isdir(testcase_filedest):
os.unlink(testcase_filedest)
for filename in glob.glob('{0}.bak*'.format(testcase_filedest)):
os.unlink(filename)
def test_issue_11003_immutable_lazy_proxy_sum(self):
# causes the Import-Module ServerManager error on Windows