2013-11-27 11:19:24 +00:00
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
2013-06-27 00:30:49 +00:00
|
|
|
# Import python libs
|
2013-09-20 23:01:57 +00:00
|
|
|
import os
|
2013-02-13 22:36:34 +00:00
|
|
|
import tempfile
|
2013-09-20 23:01:57 +00:00
|
|
|
import textwrap
|
2013-02-13 22:36:34 +00:00
|
|
|
|
2013-06-24 22:53:59 +00:00
|
|
|
# Import Salt Testing libs
|
|
|
|
from salttesting import TestCase
|
2013-06-27 00:30:49 +00:00
|
|
|
from salttesting.helpers import ensure_in_syspath
|
2013-10-23 14:36:59 +00:00
|
|
|
from salttesting.mock import MagicMock
|
2013-06-27 00:30:49 +00:00
|
|
|
|
|
|
|
ensure_in_syspath('../../')
|
|
|
|
|
|
|
|
# Import Salt libs
|
|
|
|
from salt.modules import file as filemod
|
2013-12-03 22:54:38 +00:00
|
|
|
from salt.modules import config as configmod
|
2013-08-20 22:44:03 +00:00
|
|
|
from salt.modules import cmdmod
|
2013-12-03 22:54:38 +00:00
|
|
|
from salt.exceptions import CommandExecutionError
|
2013-06-24 22:53:59 +00:00
|
|
|
|
2013-02-13 22:36:34 +00:00
|
|
|
filemod.__salt__ = {
|
2013-12-03 22:54:38 +00:00
|
|
|
'config.manage_mode': configmod.manage_mode,
|
2013-08-20 22:44:03 +00:00
|
|
|
'cmd.run': cmdmod.run,
|
|
|
|
'cmd.run_all': cmdmod.run_all
|
2013-02-13 22:36:34 +00:00
|
|
|
}
|
2013-10-23 14:36:59 +00:00
|
|
|
filemod.__opts__ = {'test': False}
|
2013-02-13 22:36:34 +00:00
|
|
|
|
|
|
|
SED_CONTENT = """test
|
|
|
|
some
|
|
|
|
content
|
|
|
|
/var/lib/foo/app/test
|
|
|
|
here
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
2013-09-20 23:01:57 +00:00
|
|
|
class FileReplaceTestCase(TestCase):
|
|
|
|
MULTILINE_STRING = textwrap.dedent('''\
|
|
|
|
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam rhoncus
|
|
|
|
enim ac bibendum vulputate. Etiam nibh velit, placerat ac auctor in,
|
|
|
|
lacinia a turpis. Nulla elit elit, ornare in sodales eu, aliquam sit
|
|
|
|
amet nisl.
|
|
|
|
|
|
|
|
Fusce ac vehicula lectus. Vivamus justo nunc, pulvinar in ornare nec,
|
|
|
|
sollicitudin id sem. Pellentesque sed ipsum dapibus, dapibus elit id,
|
|
|
|
malesuada nisi.
|
|
|
|
|
|
|
|
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
|
|
|
|
venenatis tellus eget massa facilisis, in auctor ante aliquet. Sed nec
|
|
|
|
cursus metus. Curabitur massa urna, vehicula id porttitor sed, lobortis
|
|
|
|
quis leo.
|
|
|
|
''')
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
self.tfile = tempfile.NamedTemporaryFile(delete=False)
|
|
|
|
self.tfile.write(self.MULTILINE_STRING)
|
|
|
|
self.tfile.close()
|
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
os.remove(self.tfile.name)
|
|
|
|
|
|
|
|
def test_replace(self):
|
|
|
|
filemod.replace(self.tfile.name, r'Etiam', 'Salticus', backup=False)
|
|
|
|
|
|
|
|
with open(self.tfile.name, 'rb') as fp:
|
|
|
|
self.assertIn('Salticus', fp.read())
|
|
|
|
|
|
|
|
def test_backup(self):
|
|
|
|
fext = '.bak'
|
|
|
|
bak_file = '{0}{1}'.format(self.tfile.name, fext)
|
|
|
|
|
|
|
|
filemod.replace(self.tfile.name, r'Etiam', 'Salticus', backup=fext)
|
|
|
|
|
|
|
|
self.assertTrue(os.path.exists(bak_file))
|
|
|
|
os.unlink(bak_file)
|
|
|
|
|
|
|
|
def test_nobackup(self):
|
|
|
|
fext = '.bak'
|
|
|
|
bak_file = '{0}{1}'.format(self.tfile.name, fext)
|
|
|
|
|
|
|
|
filemod.replace(self.tfile.name, r'Etiam', 'Salticus', backup=False)
|
|
|
|
|
|
|
|
self.assertFalse(os.path.exists(bak_file))
|
|
|
|
|
|
|
|
def test_dry_run(self):
|
|
|
|
before_ctime = os.stat(self.tfile.name).st_mtime
|
|
|
|
filemod.replace(self.tfile.name, r'Etiam', 'Salticus', dry_run=True)
|
|
|
|
after_ctime = os.stat(self.tfile.name).st_mtime
|
|
|
|
|
|
|
|
self.assertEqual(before_ctime, after_ctime)
|
|
|
|
|
|
|
|
def test_show_changes(self):
|
2013-12-03 22:54:38 +00:00
|
|
|
ret = filemod.replace(self.tfile.name,
|
|
|
|
r'Etiam', 'Salticus',
|
|
|
|
show_changes=True)
|
2013-09-20 23:01:57 +00:00
|
|
|
|
2013-11-27 12:56:35 +00:00
|
|
|
self.assertTrue(ret.startswith('---')) # looks like a diff
|
2013-09-20 23:01:57 +00:00
|
|
|
|
|
|
|
def test_noshow_changes(self):
|
2013-12-03 22:54:38 +00:00
|
|
|
ret = filemod.replace(self.tfile.name,
|
|
|
|
r'Etiam', 'Salticus',
|
|
|
|
show_changes=False)
|
2013-09-20 23:01:57 +00:00
|
|
|
|
|
|
|
self.assertIsInstance(ret, bool)
|
|
|
|
|
|
|
|
def test_re_str_flags(self):
|
|
|
|
# upper- & lower-case
|
2013-12-03 22:54:38 +00:00
|
|
|
filemod.replace(self.tfile.name,
|
|
|
|
r'Etiam', 'Salticus',
|
|
|
|
flags=['MULTILINE', 'ignorecase'])
|
2013-09-20 23:01:57 +00:00
|
|
|
|
|
|
|
def test_re_int_flags(self):
|
|
|
|
filemod.replace(self.tfile.name, r'Etiam', 'Salticus', flags=10)
|
|
|
|
|
2013-12-08 02:54:07 +00:00
|
|
|
def test_numeric_repl(self):
|
|
|
|
'''
|
|
|
|
This test covers cases where the replacement string is numeric, and the
|
|
|
|
CLI parser yamlifies it into a numeric type. If not converted back to a
|
|
|
|
string type in file.replace, a TypeError occurs when the replacemen is
|
|
|
|
attempted. See https://github.com/saltstack/salt/issues/9097 for more
|
|
|
|
information.
|
|
|
|
'''
|
|
|
|
filemod.replace(self.tfile.name, r'Etiam', 123)
|
|
|
|
|
2013-11-27 12:11:45 +00:00
|
|
|
|
2013-10-23 14:36:59 +00:00
|
|
|
class FileBlockReplaceTestCase(TestCase):
|
|
|
|
MULTILINE_STRING = textwrap.dedent('''\
|
|
|
|
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam rhoncus
|
|
|
|
enim ac bibendum vulputate. Etiam nibh velit, placerat ac auctor in,
|
|
|
|
lacinia a turpis. Nulla elit elit, ornare in sodales eu, aliquam sit
|
|
|
|
amet nisl.
|
|
|
|
|
|
|
|
Fusce ac vehicula lectus. Vivamus justo nunc, pulvinar in ornare nec,
|
|
|
|
sollicitudin id sem. Pellentesque sed ipsum dapibus, dapibus elit id,
|
|
|
|
malesuada nisi.
|
|
|
|
|
|
|
|
first part of start line // START BLOCK : part of start line not removed
|
|
|
|
to be removed
|
|
|
|
first part of end line // END BLOCK : part of end line not removed
|
|
|
|
|
|
|
|
#-- START BLOCK UNFINISHED
|
|
|
|
|
|
|
|
#-- START BLOCK 1
|
|
|
|
old content part 1
|
|
|
|
old content part 2
|
|
|
|
#-- END BLOCK 1
|
|
|
|
|
|
|
|
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
|
|
|
|
venenatis tellus eget massa facilisis, in auctor ante aliquet. Sed nec
|
|
|
|
cursus metus. Curabitur massa urna, vehicula id porttitor sed, lobortis
|
|
|
|
quis leo.
|
|
|
|
''')
|
|
|
|
|
|
|
|
def setUp(self):
|
2013-12-03 22:54:38 +00:00
|
|
|
self.tfile = tempfile.NamedTemporaryFile(delete=False,
|
|
|
|
prefix='blockrepltmp')
|
2013-10-23 14:36:59 +00:00
|
|
|
self.tfile.write(self.MULTILINE_STRING)
|
|
|
|
self.tfile.close()
|
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
os.remove(self.tfile.name)
|
|
|
|
|
|
|
|
def test_replace_multiline(self):
|
2013-12-03 22:54:38 +00:00
|
|
|
new_multiline_content = (
|
|
|
|
"Who's that then?\nWell, how'd you become king,"
|
|
|
|
"then?\nWe found them. I'm not a witch.\nWe shall"
|
|
|
|
"say 'Ni' again to you, if you do not appease us."
|
|
|
|
)
|
|
|
|
filemod.blockreplace(self.tfile.name,
|
|
|
|
'#-- START BLOCK 1',
|
|
|
|
'#-- END BLOCK 1',
|
|
|
|
new_multiline_content,
|
|
|
|
backup=False)
|
2013-10-23 14:36:59 +00:00
|
|
|
|
|
|
|
with open(self.tfile.name, 'rb') as fp:
|
2013-11-27 12:48:53 +00:00
|
|
|
filecontent = fp.read()
|
2013-12-03 22:54:38 +00:00
|
|
|
self.assertIn('#-- START BLOCK 1'
|
|
|
|
+ "\n" + new_multiline_content
|
|
|
|
+ "\n"
|
|
|
|
+ '#-- END BLOCK 1', filecontent)
|
2013-10-23 14:36:59 +00:00
|
|
|
self.assertNotIn('old content part 1', filecontent)
|
|
|
|
self.assertNotIn('old content part 2', filecontent)
|
|
|
|
|
|
|
|
def test_replace_append(self):
|
|
|
|
new_content = "Well, I didn't vote for you."
|
|
|
|
|
|
|
|
self.assertRaises(
|
|
|
|
CommandExecutionError,
|
|
|
|
filemod.blockreplace,
|
|
|
|
self.tfile.name,
|
|
|
|
'#-- START BLOCK 2',
|
|
|
|
'#-- END BLOCK 2',
|
|
|
|
new_content,
|
|
|
|
append_if_not_found=False,
|
|
|
|
backup=False
|
|
|
|
)
|
|
|
|
with open(self.tfile.name, 'rb') as fp:
|
2013-12-03 22:54:38 +00:00
|
|
|
self.assertNotIn('#-- START BLOCK 2'
|
|
|
|
+ "\n" + new_content + "\n"
|
|
|
|
+ '#-- END BLOCK 2', fp.read())
|
2013-10-23 14:36:59 +00:00
|
|
|
|
2013-12-03 22:54:38 +00:00
|
|
|
filemod.blockreplace(self.tfile.name,
|
|
|
|
'#-- START BLOCK 2',
|
|
|
|
'#-- END BLOCK 2',
|
|
|
|
new_content,
|
|
|
|
backup=False,
|
|
|
|
append_if_not_found=True)
|
2013-10-23 14:36:59 +00:00
|
|
|
|
|
|
|
with open(self.tfile.name, 'rb') as fp:
|
2013-12-03 22:54:38 +00:00
|
|
|
self.assertIn('#-- START BLOCK 2'
|
|
|
|
+ "\n" + new_content
|
|
|
|
+ "\n" + '#-- END BLOCK 2', fp.read())
|
2013-10-23 14:36:59 +00:00
|
|
|
|
2013-11-21 11:57:51 +00:00
|
|
|
def test_replace_prepend(self):
|
|
|
|
new_content = "Well, I didn't vote for you."
|
|
|
|
|
|
|
|
self.assertRaises(
|
|
|
|
CommandExecutionError,
|
|
|
|
filemod.blockreplace,
|
|
|
|
self.tfile.name,
|
|
|
|
'#-- START BLOCK 2',
|
|
|
|
'#-- END BLOCK 2',
|
|
|
|
new_content,
|
|
|
|
prepend_if_not_found=False,
|
|
|
|
backup=False
|
|
|
|
)
|
|
|
|
with open(self.tfile.name, 'rb') as fp:
|
2013-12-03 22:54:38 +00:00
|
|
|
self.assertNotIn(
|
|
|
|
'#-- START BLOCK 2' + "\n"
|
|
|
|
+ new_content + "\n" + '#-- END BLOCK 2',
|
|
|
|
fp.read())
|
2013-11-21 11:57:51 +00:00
|
|
|
|
2013-12-03 22:54:38 +00:00
|
|
|
filemod.blockreplace(self.tfile.name,
|
|
|
|
'#-- START BLOCK 2', '#-- END BLOCK 2',
|
|
|
|
new_content,
|
|
|
|
backup=False,
|
|
|
|
prepend_if_not_found=True)
|
2013-11-21 11:57:51 +00:00
|
|
|
|
|
|
|
with open(self.tfile.name, 'rb') as fp:
|
2013-12-03 22:54:38 +00:00
|
|
|
self.assertTrue(
|
|
|
|
fp.read().startswith(
|
|
|
|
'#-- START BLOCK 2'
|
|
|
|
+ "\n" + new_content
|
|
|
|
+ "\n" + '#-- END BLOCK 2'))
|
2013-11-21 11:57:51 +00:00
|
|
|
|
2013-10-23 14:36:59 +00:00
|
|
|
def test_replace_partial_marked_lines(self):
|
2013-12-03 22:54:38 +00:00
|
|
|
filemod.blockreplace(self.tfile.name,
|
2013-12-06 17:50:58 +00:00
|
|
|
'// START BLOCK',
|
2013-12-03 22:54:38 +00:00
|
|
|
'// END BLOCK',
|
|
|
|
'new content 1',
|
|
|
|
backup=False)
|
2013-10-23 14:36:59 +00:00
|
|
|
|
|
|
|
with open(self.tfile.name, 'rb') as fp:
|
2013-11-27 12:48:53 +00:00
|
|
|
filecontent = fp.read()
|
2013-10-23 14:36:59 +00:00
|
|
|
self.assertIn('new content 1', filecontent)
|
|
|
|
self.assertNotIn('to be removed', filecontent)
|
|
|
|
self.assertIn('first part of start line', filecontent)
|
|
|
|
self.assertIn('first part of end line', filecontent)
|
|
|
|
self.assertIn('part of start line not removed', filecontent)
|
|
|
|
self.assertIn('part of end line not removed', filecontent)
|
|
|
|
|
|
|
|
def test_backup(self):
|
|
|
|
fext = '.bak'
|
|
|
|
bak_file = '{0}{1}'.format(self.tfile.name, fext)
|
|
|
|
|
2013-12-03 22:54:38 +00:00
|
|
|
filemod.blockreplace(
|
|
|
|
self.tfile.name,
|
|
|
|
'// START BLOCK', '// END BLOCK', 'new content 2',
|
|
|
|
backup=fext)
|
2013-10-23 14:36:59 +00:00
|
|
|
|
|
|
|
self.assertTrue(os.path.exists(bak_file))
|
|
|
|
os.unlink(bak_file)
|
|
|
|
self.assertFalse(os.path.exists(bak_file))
|
|
|
|
|
|
|
|
fext = '.bak'
|
|
|
|
bak_file = '{0}{1}'.format(self.tfile.name, fext)
|
|
|
|
|
2013-12-03 22:54:38 +00:00
|
|
|
filemod.blockreplace(self.tfile.name,
|
|
|
|
'// START BLOCK', '// END BLOCK', 'new content 3',
|
|
|
|
backup=False)
|
2013-10-23 14:36:59 +00:00
|
|
|
|
|
|
|
self.assertFalse(os.path.exists(bak_file))
|
|
|
|
|
|
|
|
def test_no_modifications(self):
|
2013-12-03 22:54:38 +00:00
|
|
|
filemod.blockreplace(self.tfile.name,
|
|
|
|
'// START BLOCK', '// END BLOCK',
|
|
|
|
'new content 4',
|
|
|
|
backup=False)
|
2013-10-23 14:36:59 +00:00
|
|
|
before_ctime = os.stat(self.tfile.name).st_mtime
|
2013-12-03 22:54:38 +00:00
|
|
|
filemod.blockreplace(self.tfile.name,
|
|
|
|
'// START BLOCK',
|
|
|
|
'// END BLOCK',
|
|
|
|
'new content 4',
|
|
|
|
backup=False)
|
2013-10-23 14:36:59 +00:00
|
|
|
after_ctime = os.stat(self.tfile.name).st_mtime
|
|
|
|
|
|
|
|
self.assertEqual(before_ctime, after_ctime)
|
|
|
|
|
|
|
|
def test_dry_run(self):
|
|
|
|
before_ctime = os.stat(self.tfile.name).st_mtime
|
2013-12-03 22:54:38 +00:00
|
|
|
filemod.blockreplace(self.tfile.name,
|
|
|
|
'// START BLOCK',
|
|
|
|
'// END BLOCK',
|
|
|
|
'new content 5',
|
|
|
|
dry_run=True)
|
2013-10-23 14:36:59 +00:00
|
|
|
after_ctime = os.stat(self.tfile.name).st_mtime
|
|
|
|
|
|
|
|
self.assertEqual(before_ctime, after_ctime)
|
|
|
|
|
|
|
|
def test_show_changes(self):
|
2013-12-03 22:54:38 +00:00
|
|
|
ret = filemod.blockreplace(self.tfile.name,
|
|
|
|
'// START BLOCK',
|
|
|
|
'// END BLOCK',
|
|
|
|
'new content 6',
|
|
|
|
backup=False,
|
|
|
|
show_changes=True)
|
2013-10-23 14:36:59 +00:00
|
|
|
|
2013-11-27 12:56:35 +00:00
|
|
|
self.assertTrue(ret.startswith('---')) # looks like a diff
|
2013-10-23 14:36:59 +00:00
|
|
|
|
2013-12-03 22:54:38 +00:00
|
|
|
ret = filemod.blockreplace(self.tfile.name,
|
|
|
|
'// START BLOCK',
|
|
|
|
'// END BLOCK',
|
|
|
|
'new content 7',
|
|
|
|
backup=False,
|
|
|
|
show_changes=False)
|
2013-10-23 14:36:59 +00:00
|
|
|
|
|
|
|
self.assertIsInstance(ret, bool)
|
|
|
|
|
|
|
|
def test_unfinished_block_exception(self):
|
|
|
|
self.assertRaises(
|
|
|
|
CommandExecutionError,
|
|
|
|
filemod.blockreplace,
|
|
|
|
self.tfile.name,
|
|
|
|
'#-- START BLOCK UNFINISHED',
|
|
|
|
'#-- END BLOCK UNFINISHED',
|
|
|
|
'foobar',
|
2013-12-03 22:54:38 +00:00
|
|
|
backup=False
|
2013-10-23 14:36:59 +00:00
|
|
|
)
|
|
|
|
|
2013-09-20 23:01:57 +00:00
|
|
|
|
2013-02-13 22:36:34 +00:00
|
|
|
class FileModuleTestCase(TestCase):
|
|
|
|
def test_sed_limit_escaped(self):
|
|
|
|
with tempfile.NamedTemporaryFile() as tfile:
|
|
|
|
tfile.write(SED_CONTENT)
|
|
|
|
tfile.seek(0, 0)
|
|
|
|
|
|
|
|
path = tfile.name
|
|
|
|
before = '/var/lib/foo'
|
|
|
|
after = ''
|
|
|
|
limit = '^{0}'.format(before)
|
|
|
|
|
|
|
|
filemod.sed(path, before, after, limit=limit)
|
|
|
|
|
|
|
|
with open(path, 'rb') as newfile:
|
2013-10-24 09:39:04 +00:00
|
|
|
self.assertEqual(
|
2013-04-22 21:26:05 +00:00
|
|
|
SED_CONTENT.replace(before, ''),
|
|
|
|
newfile.read()
|
|
|
|
)
|
2013-02-13 22:36:34 +00:00
|
|
|
|
2013-10-07 14:17:25 +00:00
|
|
|
def test_append_newline_at_eof(self):
|
|
|
|
'''
|
|
|
|
Check that file.append works consistently on files with and without
|
|
|
|
newlines at end of file.
|
|
|
|
'''
|
2013-10-07 14:31:42 +00:00
|
|
|
# File ending with a newline
|
2013-10-07 14:17:25 +00:00
|
|
|
with tempfile.NamedTemporaryFile() as tfile:
|
|
|
|
tfile.write('foo\n')
|
|
|
|
tfile.flush()
|
|
|
|
filemod.append(tfile.name, 'bar')
|
|
|
|
with open(tfile.name) as tfile2:
|
|
|
|
self.assertEqual(tfile2.read(), 'foo\nbar\n')
|
2013-10-07 14:31:42 +00:00
|
|
|
# File not ending with a newline
|
2013-10-07 14:17:25 +00:00
|
|
|
with tempfile.NamedTemporaryFile() as tfile:
|
|
|
|
tfile.write('foo')
|
|
|
|
tfile.flush()
|
|
|
|
filemod.append(tfile.name, 'bar')
|
|
|
|
with open(tfile.name) as tfile2:
|
|
|
|
self.assertEqual(tfile2.read(), 'foo\nbar\n')
|
2013-10-07 14:31:42 +00:00
|
|
|
# A newline should not be added in empty files
|
|
|
|
with tempfile.NamedTemporaryFile() as tfile:
|
|
|
|
filemod.append(tfile.name, 'bar')
|
|
|
|
with open(tfile.name) as tfile2:
|
|
|
|
self.assertEqual(tfile2.read(), 'bar\n')
|
2013-10-07 14:17:25 +00:00
|
|
|
|
2013-02-13 22:36:34 +00:00
|
|
|
|
2013-06-24 22:53:59 +00:00
|
|
|
if __name__ == '__main__':
|
|
|
|
from integration import run_tests
|
2013-12-03 22:54:38 +00:00
|
|
|
run_tests(FileModuleTestCase,
|
|
|
|
FileReplaceTestCase,
|
|
|
|
FileBlockReplaceTestCase,
|
|
|
|
needs_daemon=False)
|