2013-11-27 11:19:24 +00:00
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
2013-06-27 00:30:49 +00:00
|
|
|
# Import python libs
|
2014-11-21 19:05:13 +00:00
|
|
|
from __future__ import absolute_import
|
2013-09-20 23:01:57 +00:00
|
|
|
import os
|
2017-03-27 15:25:09 +00:00
|
|
|
import shutil
|
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
|
2017-02-19 15:35:30 +00:00
|
|
|
from tests.support.mixins import LoaderModuleMockMixin
|
2017-03-27 15:25:09 +00:00
|
|
|
from tests.support.paths import TMP
|
2017-06-29 22:39:13 +00:00
|
|
|
from tests.support.unit import TestCase, skipIf
|
2017-10-30 13:14:02 +00:00
|
|
|
from tests.support.mock import MagicMock, patch, mock_open
|
2013-06-27 00:30:49 +00:00
|
|
|
|
2017-10-30 12:36:16 +00:00
|
|
|
try:
|
|
|
|
import pytest
|
|
|
|
except ImportError:
|
|
|
|
pytest = None
|
|
|
|
|
2013-06-27 00:30:49 +00:00
|
|
|
# Import Salt libs
|
2017-09-05 14:37:08 +00:00
|
|
|
import salt.config
|
|
|
|
import salt.loader
|
2017-07-18 16:31:01 +00:00
|
|
|
import salt.utils.files
|
2017-10-14 01:52:56 +00:00
|
|
|
import salt.utils.platform
|
|
|
|
import salt.utils.stringutils
|
2017-03-21 17:15:36 +00:00
|
|
|
import salt.modules.file as filemod
|
|
|
|
import salt.modules.config as configmod
|
|
|
|
import salt.modules.cmdmod as cmdmod
|
2013-12-03 22:54:38 +00:00
|
|
|
from salt.exceptions import CommandExecutionError
|
2013-06-24 22:53:59 +00:00
|
|
|
|
2017-03-22 12:12:36 +00:00
|
|
|
SED_CONTENT = '''test
|
2013-02-13 22:36:34 +00:00
|
|
|
some
|
|
|
|
content
|
|
|
|
/var/lib/foo/app/test
|
|
|
|
here
|
2017-03-22 12:12:36 +00:00
|
|
|
'''
|
2013-02-13 22:36:34 +00:00
|
|
|
|
2016-03-11 08:09:36 +00:00
|
|
|
|
2017-02-19 15:35:30 +00:00
|
|
|
class FileReplaceTestCase(TestCase, LoaderModuleMockMixin):
|
|
|
|
|
2017-03-22 12:12:36 +00:00
|
|
|
def setup_loader_modules(self):
|
2017-02-19 15:35:30 +00:00
|
|
|
return {
|
2017-03-22 12:12:36 +00:00
|
|
|
filemod: {
|
|
|
|
'__salt__': {
|
|
|
|
'config.manage_mode': configmod.manage_mode,
|
|
|
|
'cmd.run': cmdmod.run,
|
|
|
|
'cmd.run_all': cmdmod.run_all
|
|
|
|
},
|
|
|
|
'__opts__': {
|
|
|
|
'test': False,
|
|
|
|
'file_roots': {'base': 'tmp'},
|
|
|
|
'pillar_roots': {'base': 'tmp'},
|
|
|
|
'cachedir': 'tmp',
|
|
|
|
'grains': {},
|
|
|
|
},
|
2017-09-05 14:37:08 +00:00
|
|
|
'__grains__': {'kernel': 'Linux'},
|
2017-10-12 18:17:24 +00:00
|
|
|
'__utils__': {'files.is_text': MagicMock(return_value=True)},
|
2017-03-22 12:12:36 +00:00
|
|
|
}
|
2017-02-19 15:35:30 +00:00
|
|
|
}
|
2013-02-13 22:36:34 +00:00
|
|
|
|
2013-09-20 23:01:57 +00:00
|
|
|
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):
|
2015-06-05 22:53:53 +00:00
|
|
|
self.tfile = tempfile.NamedTemporaryFile(delete=False, mode='w+')
|
2013-09-20 23:01:57 +00:00
|
|
|
self.tfile.write(self.MULTILINE_STRING)
|
|
|
|
self.tfile.close()
|
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
os.remove(self.tfile.name)
|
2017-03-15 19:23:47 +00:00
|
|
|
del self.tfile
|
2013-09-20 23:01:57 +00:00
|
|
|
|
|
|
|
def test_replace(self):
|
|
|
|
filemod.replace(self.tfile.name, r'Etiam', 'Salticus', backup=False)
|
|
|
|
|
2017-07-18 16:31:01 +00:00
|
|
|
with salt.utils.files.fopen(self.tfile.name, 'r') as fp:
|
2013-09-20 23:01:57 +00:00
|
|
|
self.assertIn('Salticus', fp.read())
|
|
|
|
|
2014-03-11 18:08:38 +00:00
|
|
|
def test_replace_append_if_not_found(self):
|
|
|
|
'''
|
|
|
|
Check that file.replace append_if_not_found works
|
|
|
|
'''
|
|
|
|
args = {
|
|
|
|
'pattern': '#*baz=(?P<value>.*)',
|
|
|
|
'repl': 'baz=\\g<value>',
|
|
|
|
'append_if_not_found': True,
|
|
|
|
}
|
2017-06-29 22:39:13 +00:00
|
|
|
base = os.linesep.join(['foo=1', 'bar=2'])
|
|
|
|
|
2014-03-11 18:08:38 +00:00
|
|
|
# File ending with a newline, no match
|
2017-06-29 22:39:13 +00:00
|
|
|
with tempfile.NamedTemporaryFile('w+b', delete=False) as tfile:
|
2017-10-14 01:52:56 +00:00
|
|
|
tfile.write(salt.utils.stringutils.to_bytes(base + os.linesep))
|
2014-03-11 18:08:38 +00:00
|
|
|
tfile.flush()
|
2017-06-29 22:39:13 +00:00
|
|
|
filemod.replace(tfile.name, **args)
|
|
|
|
expected = os.linesep.join([base, 'baz=\\g<value>']) + os.linesep
|
2017-09-26 17:45:10 +00:00
|
|
|
with salt.utils.files.fopen(tfile.name) as tfile2:
|
2017-06-29 22:39:13 +00:00
|
|
|
self.assertEqual(tfile2.read(), expected)
|
|
|
|
os.remove(tfile.name)
|
|
|
|
|
2014-03-11 18:08:38 +00:00
|
|
|
# File not ending with a newline, no match
|
2017-06-29 22:39:13 +00:00
|
|
|
with tempfile.NamedTemporaryFile('w+b', delete=False) as tfile:
|
2017-10-14 01:52:56 +00:00
|
|
|
tfile.write(salt.utils.stringutils.to_bytes(base))
|
2014-03-11 18:08:38 +00:00
|
|
|
tfile.flush()
|
2017-06-29 22:39:13 +00:00
|
|
|
filemod.replace(tfile.name, **args)
|
2017-09-26 17:45:10 +00:00
|
|
|
with salt.utils.files.fopen(tfile.name) as tfile2:
|
2017-06-29 22:39:13 +00:00
|
|
|
self.assertEqual(tfile2.read(), expected)
|
|
|
|
os.remove(tfile.name)
|
|
|
|
|
2014-03-11 18:08:38 +00:00
|
|
|
# A newline should not be added in empty files
|
2017-09-14 14:42:19 +00:00
|
|
|
with tempfile.NamedTemporaryFile('w+b', delete=False) as tfile:
|
|
|
|
pass
|
2017-06-29 22:39:13 +00:00
|
|
|
filemod.replace(tfile.name, **args)
|
|
|
|
expected = args['repl'] + os.linesep
|
2017-09-26 17:45:10 +00:00
|
|
|
with salt.utils.files.fopen(tfile.name) as tfile2:
|
2017-06-29 22:39:13 +00:00
|
|
|
self.assertEqual(tfile2.read(), expected)
|
|
|
|
os.remove(tfile.name)
|
|
|
|
|
2014-03-11 18:08:38 +00:00
|
|
|
# Using not_found_content, rather than repl
|
2017-06-29 22:39:13 +00:00
|
|
|
with tempfile.NamedTemporaryFile('w+b', delete=False) as tfile:
|
2017-10-14 01:52:56 +00:00
|
|
|
tfile.write(salt.utils.stringutils.to_bytes(base))
|
2014-03-11 18:08:38 +00:00
|
|
|
tfile.flush()
|
2017-06-29 22:39:13 +00:00
|
|
|
args['not_found_content'] = 'baz=3'
|
|
|
|
expected = os.linesep.join([base, 'baz=3']) + os.linesep
|
|
|
|
filemod.replace(tfile.name, **args)
|
2017-09-26 17:45:10 +00:00
|
|
|
with salt.utils.files.fopen(tfile.name) as tfile2:
|
2017-06-29 22:39:13 +00:00
|
|
|
self.assertEqual(tfile2.read(), expected)
|
|
|
|
os.remove(tfile.name)
|
|
|
|
|
2014-03-11 18:08:38 +00:00
|
|
|
# not appending if matches
|
2017-06-29 22:39:13 +00:00
|
|
|
with tempfile.NamedTemporaryFile('w+b', delete=False) as tfile:
|
|
|
|
base = os.linesep.join(['foo=1', 'baz=42', 'bar=2'])
|
2017-10-14 01:52:56 +00:00
|
|
|
tfile.write(salt.utils.stringutils.to_bytes(base))
|
2014-03-11 18:08:38 +00:00
|
|
|
tfile.flush()
|
2017-06-29 22:39:13 +00:00
|
|
|
expected = base
|
|
|
|
filemod.replace(tfile.name, **args)
|
2017-09-26 17:45:10 +00:00
|
|
|
with salt.utils.files.fopen(tfile.name) as tfile2:
|
2017-06-29 22:39:13 +00:00
|
|
|
self.assertEqual(tfile2.read(), expected)
|
2014-03-11 18:08:38 +00:00
|
|
|
|
2013-09-20 23:01:57 +00:00
|
|
|
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
|
|
|
|
2017-02-19 15:35:30 +00:00
|
|
|
class FileBlockReplaceTestCase(TestCase, LoaderModuleMockMixin):
|
2017-03-22 12:12:36 +00:00
|
|
|
def setup_loader_modules(self):
|
2017-02-19 15:35:30 +00:00
|
|
|
return {
|
2017-03-22 12:12:36 +00:00
|
|
|
filemod: {
|
|
|
|
'__salt__': {
|
|
|
|
'config.manage_mode': MagicMock(),
|
|
|
|
'cmd.run': cmdmod.run,
|
|
|
|
'cmd.run_all': cmdmod.run_all
|
|
|
|
},
|
|
|
|
'__opts__': {
|
|
|
|
'test': False,
|
|
|
|
'file_roots': {'base': 'tmp'},
|
|
|
|
'pillar_roots': {'base': 'tmp'},
|
|
|
|
'cachedir': 'tmp',
|
|
|
|
'grains': {},
|
|
|
|
},
|
2017-09-05 14:37:08 +00:00
|
|
|
'__grains__': {'kernel': 'Linux'},
|
2017-10-12 18:17:24 +00:00
|
|
|
'__utils__': {'files.is_text': MagicMock(return_value=True)},
|
2017-03-22 12:12:36 +00:00
|
|
|
}
|
2017-02-19 15:35:30 +00:00
|
|
|
}
|
|
|
|
|
2013-10-23 14:36:59 +00:00
|
|
|
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,
|
2015-06-05 22:53:53 +00:00
|
|
|
prefix='blockrepltmp',
|
|
|
|
mode='w+')
|
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)
|
2017-02-19 15:35:30 +00:00
|
|
|
del self.tfile
|
2013-10-23 14:36:59 +00:00
|
|
|
|
|
|
|
def test_replace_multiline(self):
|
2017-06-29 22:39:13 +00:00
|
|
|
new_multiline_content = os.linesep.join([
|
|
|
|
"Who's that then?",
|
|
|
|
"Well, how'd you become king, then?",
|
|
|
|
"We found them. I'm not a witch.",
|
|
|
|
"We shall say 'Ni' again to you, if you do not appease us."
|
|
|
|
])
|
2013-12-03 22:54:38 +00:00
|
|
|
filemod.blockreplace(self.tfile.name,
|
|
|
|
'#-- START BLOCK 1',
|
|
|
|
'#-- END BLOCK 1',
|
|
|
|
new_multiline_content,
|
|
|
|
backup=False)
|
2013-10-23 14:36:59 +00:00
|
|
|
|
2017-09-26 17:45:10 +00:00
|
|
|
with salt.utils.files.fopen(self.tfile.name, 'rb') as fp:
|
2013-11-27 12:48:53 +00:00
|
|
|
filecontent = fp.read()
|
2017-10-14 01:52:56 +00:00
|
|
|
self.assertIn(salt.utils.stringutils.to_bytes(
|
2017-06-29 22:39:13 +00:00
|
|
|
os.linesep.join([
|
2017-08-23 23:11:18 +00:00
|
|
|
'#-- START BLOCK 1', new_multiline_content, '#-- END BLOCK 1'])),
|
2017-06-29 22:39:13 +00:00
|
|
|
filecontent)
|
2017-08-23 23:11:18 +00:00
|
|
|
self.assertNotIn(b'old content part 1', filecontent)
|
|
|
|
self.assertNotIn(b'old content part 2', filecontent)
|
2013-10-23 14:36:59 +00:00
|
|
|
|
|
|
|
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
|
|
|
|
)
|
2017-07-18 16:31:01 +00:00
|
|
|
with salt.utils.files.fopen(self.tfile.name, 'r') as fp:
|
2013-12-03 22:54:38 +00:00
|
|
|
self.assertNotIn('#-- START BLOCK 2'
|
2016-05-06 14:44:20 +00:00
|
|
|
+ "\n" + new_content
|
2013-12-03 22:54:38 +00:00
|
|
|
+ '#-- 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
|
|
|
|
2017-09-26 17:45:10 +00:00
|
|
|
with salt.utils.files.fopen(self.tfile.name, 'rb') as fp:
|
2017-10-14 01:52:56 +00:00
|
|
|
self.assertIn(salt.utils.stringutils.to_bytes(
|
2017-06-29 22:39:13 +00:00
|
|
|
os.linesep.join([
|
|
|
|
'#-- START BLOCK 2',
|
2017-08-23 23:11:18 +00:00
|
|
|
'{0}#-- END BLOCK 2'.format(new_content)])),
|
2017-06-29 22:39:13 +00:00
|
|
|
fp.read())
|
2013-10-23 14:36:59 +00:00
|
|
|
|
2014-03-11 17:46:01 +00:00
|
|
|
def test_replace_append_newline_at_eof(self):
|
|
|
|
'''
|
|
|
|
Check that file.blockreplace works consistently on files with and
|
|
|
|
without newlines at end of file.
|
|
|
|
'''
|
|
|
|
base = 'bar'
|
|
|
|
args = {
|
|
|
|
'marker_start': '#start',
|
|
|
|
'marker_end': '#stop',
|
|
|
|
'content': 'baz',
|
|
|
|
'append_if_not_found': True,
|
|
|
|
}
|
2017-06-29 22:39:13 +00:00
|
|
|
block = os.linesep.join(['#start', 'baz#stop']) + os.linesep
|
2014-03-11 17:46:01 +00:00
|
|
|
# File ending with a newline
|
2017-06-29 22:39:13 +00:00
|
|
|
with tempfile.NamedTemporaryFile(mode='w+b', delete=False) as tfile:
|
2017-10-14 01:52:56 +00:00
|
|
|
tfile.write(salt.utils.stringutils.to_bytes(base + os.linesep))
|
2014-03-11 17:46:01 +00:00
|
|
|
tfile.flush()
|
2017-06-29 22:39:13 +00:00
|
|
|
filemod.blockreplace(tfile.name, **args)
|
|
|
|
expected = os.linesep.join([base, block])
|
2017-09-26 17:45:10 +00:00
|
|
|
with salt.utils.files.fopen(tfile.name) as tfile2:
|
2017-06-29 22:39:13 +00:00
|
|
|
self.assertEqual(tfile2.read(), expected)
|
|
|
|
os.remove(tfile.name)
|
|
|
|
|
2014-03-11 17:46:01 +00:00
|
|
|
# File not ending with a newline
|
2017-06-29 22:39:13 +00:00
|
|
|
with tempfile.NamedTemporaryFile(mode='w+b', delete=False) as tfile:
|
2017-10-14 01:52:56 +00:00
|
|
|
tfile.write(salt.utils.stringutils.to_bytes(base))
|
2014-03-11 17:46:01 +00:00
|
|
|
tfile.flush()
|
2017-06-29 22:39:13 +00:00
|
|
|
filemod.blockreplace(tfile.name, **args)
|
2017-09-26 17:45:10 +00:00
|
|
|
with salt.utils.files.fopen(tfile.name) as tfile2:
|
2017-06-29 22:39:13 +00:00
|
|
|
self.assertEqual(tfile2.read(), expected)
|
|
|
|
os.remove(tfile.name)
|
|
|
|
|
2014-03-11 17:46:01 +00:00
|
|
|
# A newline should not be added in empty files
|
2017-09-14 14:42:19 +00:00
|
|
|
with tempfile.NamedTemporaryFile(mode='w+b', delete=False) as tfile:
|
|
|
|
pass
|
2017-06-29 22:39:13 +00:00
|
|
|
filemod.blockreplace(tfile.name, **args)
|
2017-09-26 17:45:10 +00:00
|
|
|
with salt.utils.files.fopen(tfile.name) as tfile2:
|
2017-06-29 22:39:13 +00:00
|
|
|
self.assertEqual(tfile2.read(), block)
|
|
|
|
os.remove(tfile.name)
|
2014-03-11 17:46:01 +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
|
|
|
|
)
|
2017-09-26 17:45:10 +00:00
|
|
|
with salt.utils.files.fopen(self.tfile.name, 'rb') as fp:
|
2017-10-14 01:52:56 +00:00
|
|
|
self.assertNotIn(salt.utils.stringutils.to_bytes(
|
2017-06-29 22:39:13 +00:00
|
|
|
os.linesep.join([
|
|
|
|
'#-- START BLOCK 2',
|
2017-08-23 23:11:18 +00:00
|
|
|
'{0}#-- END BLOCK 2'.format(new_content)])),
|
2013-12-03 22:54:38 +00:00
|
|
|
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
|
|
|
|
2017-09-26 17:45:10 +00:00
|
|
|
with salt.utils.files.fopen(self.tfile.name, 'rb') as fp:
|
2013-12-03 22:54:38 +00:00
|
|
|
self.assertTrue(
|
2017-10-14 01:52:56 +00:00
|
|
|
fp.read().startswith(salt.utils.stringutils.to_bytes(
|
2017-06-29 22:39:13 +00:00
|
|
|
os.linesep.join([
|
|
|
|
'#-- START BLOCK 2',
|
2017-08-23 23:11:18 +00:00
|
|
|
'{0}#-- END BLOCK 2'.format(new_content)]))))
|
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
|
|
|
|
2017-07-18 16:31:01 +00:00
|
|
|
with salt.utils.files.fopen(self.tfile.name, 'r') 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
|
|
|
|
2017-02-19 15:35:30 +00:00
|
|
|
class FileModuleTestCase(TestCase, LoaderModuleMockMixin):
|
2017-03-22 12:12:36 +00:00
|
|
|
def setup_loader_modules(self):
|
2017-02-19 15:35:30 +00:00
|
|
|
return {
|
2017-03-22 12:12:36 +00:00
|
|
|
filemod: {
|
|
|
|
'__salt__': {
|
|
|
|
'config.manage_mode': configmod.manage_mode,
|
|
|
|
'cmd.run': cmdmod.run,
|
|
|
|
'cmd.run_all': cmdmod.run_all
|
|
|
|
},
|
|
|
|
'__opts__': {
|
|
|
|
'test': False,
|
|
|
|
'file_roots': {'base': 'tmp'},
|
|
|
|
'pillar_roots': {'base': 'tmp'},
|
|
|
|
'cachedir': 'tmp',
|
|
|
|
'grains': {},
|
|
|
|
},
|
|
|
|
'__grains__': {'kernel': 'Linux'}
|
|
|
|
}
|
2017-02-19 15:35:30 +00:00
|
|
|
}
|
|
|
|
|
2017-10-12 13:49:41 +00:00
|
|
|
def test_check_file_meta_no_lsattr(self):
|
|
|
|
'''
|
|
|
|
Ensure that we skip attribute comparison if lsattr(1) is not found
|
|
|
|
'''
|
|
|
|
source = "salt:///README.md"
|
|
|
|
name = "/home/git/proj/a/README.md"
|
|
|
|
source_sum = {}
|
|
|
|
stats_result = {'size': 22, 'group': 'wheel', 'uid': 0, 'type': 'file',
|
|
|
|
'mode': '0600', 'gid': 0, 'target': name, 'user':
|
|
|
|
'root', 'mtime': 1508356390, 'atime': 1508356390,
|
|
|
|
'inode': 447, 'ctime': 1508356390}
|
|
|
|
with patch('salt.modules.file.stats') as m_stats:
|
|
|
|
m_stats.return_value = stats_result
|
|
|
|
with patch('salt.utils.path.which') as m_which:
|
|
|
|
m_which.return_value = None
|
|
|
|
result = filemod.check_file_meta(name, name, source, source_sum,
|
|
|
|
'root', 'root', '755', None,
|
|
|
|
'base')
|
|
|
|
self.assertTrue(result, None)
|
|
|
|
|
2017-10-14 01:52:56 +00:00
|
|
|
@skipIf(salt.utils.platform.is_windows(), 'SED is not available on Windows')
|
2013-02-13 22:36:34 +00:00
|
|
|
def test_sed_limit_escaped(self):
|
2015-06-05 22:53:53 +00:00
|
|
|
with tempfile.NamedTemporaryFile(mode='w+') as tfile:
|
2013-02-13 22:36:34 +00:00
|
|
|
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)
|
|
|
|
|
2017-07-18 16:31:01 +00:00
|
|
|
with salt.utils.files.fopen(path, 'r') 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
|
2017-06-29 22:39:13 +00:00
|
|
|
with tempfile.NamedTemporaryFile(mode='w+b', delete=False) as tfile:
|
2017-10-14 01:52:56 +00:00
|
|
|
tfile.write(salt.utils.stringutils.to_bytes('foo' + os.linesep))
|
2013-10-07 14:17:25 +00:00
|
|
|
tfile.flush()
|
2017-06-29 22:39:13 +00:00
|
|
|
filemod.append(tfile.name, 'bar')
|
|
|
|
expected = os.linesep.join(['foo', 'bar']) + os.linesep
|
2017-09-26 17:45:10 +00:00
|
|
|
with salt.utils.files.fopen(tfile.name) as tfile2:
|
2017-06-29 22:39:13 +00:00
|
|
|
self.assertEqual(tfile2.read(), expected)
|
|
|
|
|
2013-10-07 14:31:42 +00:00
|
|
|
# File not ending with a newline
|
2017-06-29 22:39:13 +00:00
|
|
|
with tempfile.NamedTemporaryFile(mode='w+b', delete=False) as tfile:
|
2017-10-14 01:52:56 +00:00
|
|
|
tfile.write(salt.utils.stringutils.to_bytes('foo'))
|
2013-10-07 14:17:25 +00:00
|
|
|
tfile.flush()
|
2017-06-29 22:39:13 +00:00
|
|
|
filemod.append(tfile.name, 'bar')
|
2017-10-14 01:52:56 +00:00
|
|
|
with salt.utils.files.fopen(tfile.name) as tfile2:
|
2017-06-29 22:39:13 +00:00
|
|
|
self.assertEqual(tfile2.read(), expected)
|
|
|
|
|
|
|
|
# A newline should be added in empty files
|
|
|
|
with tempfile.NamedTemporaryFile(mode='w+b', delete=False) as tfile:
|
2013-10-07 14:17:25 +00:00
|
|
|
filemod.append(tfile.name, 'bar')
|
2017-09-26 17:45:10 +00:00
|
|
|
with salt.utils.files.fopen(tfile.name) as tfile2:
|
2017-06-29 22:39:13 +00:00
|
|
|
self.assertEqual(tfile2.read(), 'bar' + os.linesep)
|
2013-10-07 14:17:25 +00:00
|
|
|
|
2014-01-29 11:57:47 +00:00
|
|
|
def test_extract_hash(self):
|
|
|
|
'''
|
|
|
|
Check various hash file formats.
|
|
|
|
'''
|
|
|
|
# With file name
|
2017-06-29 22:39:13 +00:00
|
|
|
with tempfile.NamedTemporaryFile(mode='w+b', delete=False) as tfile:
|
2017-10-14 01:52:56 +00:00
|
|
|
tfile.write(salt.utils.stringutils.to_bytes(
|
2016-11-04 14:53:36 +00:00
|
|
|
'rc.conf ef6e82e4006dee563d98ada2a2a80a27\n'
|
|
|
|
'ead48423703509d37c4a90e6a0d53e143b6fc268 example.tar.gz\n'
|
|
|
|
'fe05bcdcdc4928012781a5f1a2a77cbb5398e106 ./subdir/example.tar.gz\n'
|
|
|
|
'ad782ecdac770fc6eb9a62e44f90873fb97fb26b foo.tar.bz2\n'
|
2017-08-23 23:11:18 +00:00
|
|
|
))
|
2014-01-29 11:57:47 +00:00
|
|
|
tfile.flush()
|
2016-11-04 14:53:36 +00:00
|
|
|
|
2017-06-29 22:39:13 +00:00
|
|
|
result = filemod.extract_hash(tfile.name, '', '/rc.conf')
|
|
|
|
self.assertEqual(result, {
|
|
|
|
'hsum': 'ef6e82e4006dee563d98ada2a2a80a27',
|
|
|
|
'hash_type': 'md5'
|
|
|
|
})
|
|
|
|
|
|
|
|
result = filemod.extract_hash(tfile.name, '', '/example.tar.gz')
|
|
|
|
self.assertEqual(result, {
|
|
|
|
'hsum': 'ead48423703509d37c4a90e6a0d53e143b6fc268',
|
|
|
|
'hash_type': 'sha1'
|
|
|
|
})
|
|
|
|
|
|
|
|
# All the checksums in this test file are sha1 sums. We run this
|
|
|
|
# loop three times. The first pass tests auto-detection of hash
|
|
|
|
# type by length of the hash. The second tests matching a specific
|
|
|
|
# type. The third tests a failed attempt to match a specific type,
|
|
|
|
# since sha256 was requested but sha1 is what is in the file.
|
|
|
|
for hash_type in ('', 'sha1', 'sha256'):
|
|
|
|
# Test the source_hash_name argument. Even though there are
|
|
|
|
# matches in the source_hash file for both the file_name and
|
|
|
|
# source params, they should be ignored in favor of the
|
|
|
|
# source_hash_name.
|
|
|
|
file_name = '/example.tar.gz'
|
|
|
|
source = 'https://mydomain.tld/foo.tar.bz2?key1=val1&key2=val2'
|
|
|
|
source_hash_name = './subdir/example.tar.gz'
|
|
|
|
result = filemod.extract_hash(
|
|
|
|
tfile.name,
|
|
|
|
hash_type,
|
|
|
|
file_name,
|
|
|
|
source,
|
|
|
|
source_hash_name)
|
|
|
|
expected = {
|
|
|
|
'hsum': 'fe05bcdcdc4928012781a5f1a2a77cbb5398e106',
|
|
|
|
'hash_type': 'sha1'
|
|
|
|
} if hash_type != 'sha256' else None
|
|
|
|
self.assertEqual(result, expected)
|
|
|
|
|
|
|
|
# Test both a file_name and source but no source_hash_name.
|
|
|
|
# Even though there are matches for both file_name and
|
|
|
|
# source_hash_name, file_name should be preferred.
|
|
|
|
file_name = '/example.tar.gz'
|
|
|
|
source = 'https://mydomain.tld/foo.tar.bz2?key1=val1&key2=val2'
|
|
|
|
source_hash_name = None
|
|
|
|
result = filemod.extract_hash(
|
|
|
|
tfile.name,
|
|
|
|
hash_type,
|
|
|
|
file_name,
|
|
|
|
source,
|
|
|
|
source_hash_name)
|
|
|
|
expected = {
|
2014-01-29 11:57:47 +00:00
|
|
|
'hsum': 'ead48423703509d37c4a90e6a0d53e143b6fc268',
|
|
|
|
'hash_type': 'sha1'
|
2017-06-29 22:39:13 +00:00
|
|
|
} if hash_type != 'sha256' else None
|
|
|
|
self.assertEqual(result, expected)
|
|
|
|
|
|
|
|
# Test both a file_name and source but no source_hash_name.
|
|
|
|
# Since there is no match for the file_name, the source is
|
|
|
|
# matched.
|
|
|
|
file_name = '/somefile.tar.gz'
|
|
|
|
source = 'https://mydomain.tld/foo.tar.bz2?key1=val1&key2=val2'
|
|
|
|
source_hash_name = None
|
|
|
|
result = filemod.extract_hash(
|
|
|
|
tfile.name,
|
|
|
|
hash_type,
|
|
|
|
file_name,
|
|
|
|
source,
|
|
|
|
source_hash_name)
|
|
|
|
expected = {
|
|
|
|
'hsum': 'ad782ecdac770fc6eb9a62e44f90873fb97fb26b',
|
|
|
|
'hash_type': 'sha1'
|
|
|
|
} if hash_type != 'sha256' else None
|
|
|
|
self.assertEqual(result, expected)
|
2016-11-04 14:53:36 +00:00
|
|
|
|
|
|
|
# Hash only, no file name (Maven repo checksum format)
|
|
|
|
# Since there is no name match, the first checksum in the file will
|
|
|
|
# always be returned, never the second.
|
2017-06-29 22:39:13 +00:00
|
|
|
with tempfile.NamedTemporaryFile(mode='w+b', delete=False) as tfile:
|
2017-10-14 01:52:56 +00:00
|
|
|
tfile.write(salt.utils.stringutils.to_bytes(
|
2017-08-23 23:11:18 +00:00
|
|
|
'ead48423703509d37c4a90e6a0d53e143b6fc268\n'
|
|
|
|
'ad782ecdac770fc6eb9a62e44f90873fb97fb26b\n'))
|
2014-01-29 11:57:47 +00:00
|
|
|
tfile.flush()
|
2016-11-04 14:53:36 +00:00
|
|
|
|
2017-06-29 22:39:13 +00:00
|
|
|
for hash_type in ('', 'sha1', 'sha256'):
|
|
|
|
result = filemod.extract_hash(tfile.name, hash_type, '/testfile')
|
|
|
|
expected = {
|
|
|
|
'hsum': 'ead48423703509d37c4a90e6a0d53e143b6fc268',
|
|
|
|
'hash_type': 'sha1'
|
|
|
|
} if hash_type != 'sha256' else None
|
|
|
|
self.assertEqual(result, expected)
|
2014-01-29 11:57:47 +00:00
|
|
|
|
2014-04-02 17:54:42 +00:00
|
|
|
def test_user_to_uid_int(self):
|
|
|
|
'''
|
|
|
|
Tests if user is passed as an integer
|
|
|
|
'''
|
2014-04-03 19:02:10 +00:00
|
|
|
user = 5034
|
2014-04-02 17:54:42 +00:00
|
|
|
ret = filemod.user_to_uid(user)
|
|
|
|
self.assertEqual(ret, user)
|
|
|
|
|
|
|
|
def test_group_to_gid_int(self):
|
|
|
|
'''
|
|
|
|
Tests if group is passed as an integer
|
|
|
|
'''
|
2014-04-03 19:02:10 +00:00
|
|
|
group = 5034
|
2014-04-02 17:54:42 +00:00
|
|
|
ret = filemod.group_to_gid(group)
|
|
|
|
self.assertEqual(ret, group)
|
|
|
|
|
2017-04-10 13:00:57 +00:00
|
|
|
def test_patch(self):
|
|
|
|
with patch('os.path.isdir', return_value=False) as mock_isdir, \
|
Use explicit unicode strings + break up salt.utils
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.
A summary of the changes in this PR is as follows:
* Moves the following functions from `salt.utils` to new locations
(including a deprecation warning if invoked from `salt.utils`):
`to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
`dequote`, `is_hex`, `is_bin_str`, `rand_string`,
`contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
`which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
`is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
`is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
`is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
`salt/utils/__init__.py` for better organization, so we can keep the
deprecated ones separate from the ones yet to be deprecated as we
continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
such that it returns a string matching the passed size. Previously
this function would get `size` bytes from `os.urandom()`,
base64-encode it, and return the result, which would in most cases not
be equal to the passed size.
2017-07-25 01:47:15 +00:00
|
|
|
patch('salt.utils.path.which', return_value='/bin/patch') as mock_which:
|
2017-04-10 13:00:57 +00:00
|
|
|
cmd_mock = MagicMock(return_value='test_retval')
|
|
|
|
with patch.dict(filemod.__salt__, {'cmd.run_all': cmd_mock}):
|
|
|
|
ret = filemod.patch('/path/to/file', '/path/to/patch')
|
|
|
|
cmd = ['/bin/patch', '--forward', '--reject-file=-',
|
|
|
|
'-i', '/path/to/patch', '/path/to/file']
|
|
|
|
cmd_mock.assert_called_once_with(cmd, python_shell=False)
|
|
|
|
self.assertEqual('test_retval', ret)
|
|
|
|
|
|
|
|
def test_patch_dry_run(self):
|
|
|
|
with patch('os.path.isdir', return_value=False) as mock_isdir, \
|
Use explicit unicode strings + break up salt.utils
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.
A summary of the changes in this PR is as follows:
* Moves the following functions from `salt.utils` to new locations
(including a deprecation warning if invoked from `salt.utils`):
`to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
`dequote`, `is_hex`, `is_bin_str`, `rand_string`,
`contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
`which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
`is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
`is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
`is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
`salt/utils/__init__.py` for better organization, so we can keep the
deprecated ones separate from the ones yet to be deprecated as we
continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
such that it returns a string matching the passed size. Previously
this function would get `size` bytes from `os.urandom()`,
base64-encode it, and return the result, which would in most cases not
be equal to the passed size.
2017-07-25 01:47:15 +00:00
|
|
|
patch('salt.utils.path.which', return_value='/bin/patch') as mock_which:
|
2017-04-10 13:00:57 +00:00
|
|
|
cmd_mock = MagicMock(return_value='test_retval')
|
|
|
|
with patch.dict(filemod.__salt__, {'cmd.run_all': cmd_mock}):
|
|
|
|
ret = filemod.patch('/path/to/file', '/path/to/patch', dry_run=True)
|
|
|
|
cmd = ['/bin/patch', '--dry-run', '--forward', '--reject-file=-',
|
|
|
|
'-i', '/path/to/patch', '/path/to/file']
|
|
|
|
cmd_mock.assert_called_once_with(cmd, python_shell=False)
|
|
|
|
self.assertEqual('test_retval', ret)
|
|
|
|
|
|
|
|
def test_patch_dir(self):
|
|
|
|
with patch('os.path.isdir', return_value=True) as mock_isdir, \
|
Use explicit unicode strings + break up salt.utils
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.
A summary of the changes in this PR is as follows:
* Moves the following functions from `salt.utils` to new locations
(including a deprecation warning if invoked from `salt.utils`):
`to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
`dequote`, `is_hex`, `is_bin_str`, `rand_string`,
`contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
`which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
`is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
`is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
`is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
`salt/utils/__init__.py` for better organization, so we can keep the
deprecated ones separate from the ones yet to be deprecated as we
continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
such that it returns a string matching the passed size. Previously
this function would get `size` bytes from `os.urandom()`,
base64-encode it, and return the result, which would in most cases not
be equal to the passed size.
2017-07-25 01:47:15 +00:00
|
|
|
patch('salt.utils.path.which', return_value='/bin/patch') as mock_which:
|
2017-04-10 13:00:57 +00:00
|
|
|
cmd_mock = MagicMock(return_value='test_retval')
|
|
|
|
with patch.dict(filemod.__salt__, {'cmd.run_all': cmd_mock}):
|
|
|
|
ret = filemod.patch('/path/to/dir', '/path/to/patch')
|
|
|
|
cmd = ['/bin/patch', '--forward', '--reject-file=-',
|
|
|
|
'-i', '/path/to/patch', '-d', '/path/to/dir', '--strip=0']
|
|
|
|
cmd_mock.assert_called_once_with(cmd, python_shell=False)
|
|
|
|
self.assertEqual('test_retval', ret)
|
2016-03-18 18:21:09 +00:00
|
|
|
|
2016-03-11 08:09:36 +00:00
|
|
|
def test_apply_template_on_contents(self):
|
|
|
|
'''
|
|
|
|
Tests that the templating engine works on string contents
|
|
|
|
'''
|
|
|
|
contents = 'This is a {{ template }}.'
|
|
|
|
defaults = {'template': 'templated file'}
|
|
|
|
ret = filemod.apply_template_on_contents(
|
|
|
|
contents,
|
|
|
|
template='jinja',
|
|
|
|
context={'opts': filemod.__opts__},
|
|
|
|
defaults=defaults,
|
|
|
|
saltenv='base')
|
|
|
|
self.assertEqual(ret, 'This is a templated file.')
|
2016-01-13 18:15:21 +00:00
|
|
|
|
2017-10-23 14:40:35 +00:00
|
|
|
|
2017-10-30 13:15:49 +00:00
|
|
|
@skipIf(pytest is None, 'PyTest required for this set of tests')
|
2017-10-30 12:52:44 +00:00
|
|
|
class FilemodLineTests(TestCase, LoaderModuleMockMixin):
|
|
|
|
'''
|
|
|
|
Unit tests for file.line
|
|
|
|
'''
|
|
|
|
def setup_loader_modules(self):
|
|
|
|
return {
|
|
|
|
filemod: {
|
|
|
|
'__salt__': {
|
|
|
|
'config.manage_mode': configmod.manage_mode,
|
|
|
|
'cmd.run': cmdmod.run,
|
|
|
|
'cmd.run_all': cmdmod.run_all
|
|
|
|
},
|
|
|
|
'__opts__': {
|
|
|
|
'test': False,
|
|
|
|
'file_roots': {'base': 'tmp'},
|
|
|
|
'pillar_roots': {'base': 'tmp'},
|
|
|
|
'cachedir': 'tmp',
|
|
|
|
'grains': {},
|
|
|
|
},
|
|
|
|
'__grains__': {'kernel': 'Linux'}
|
|
|
|
}
|
|
|
|
}
|
2017-10-23 14:40:35 +00:00
|
|
|
|
2016-11-03 20:57:10 +00:00
|
|
|
def test_replace_line_in_empty_file(self):
|
|
|
|
'''
|
|
|
|
Tests that when calling file.line with ``mode=replace``,
|
|
|
|
the function doesn't stack trace if the file is empty.
|
|
|
|
Should return ``False``.
|
|
|
|
|
|
|
|
See Issue #31135.
|
|
|
|
'''
|
|
|
|
# Create an empty temporary named file
|
|
|
|
empty_file = tempfile.NamedTemporaryFile(delete=False,
|
|
|
|
mode='w+')
|
|
|
|
|
|
|
|
# Assert that the file was created and is empty
|
|
|
|
self.assertEqual(os.stat(empty_file.name).st_size, 0)
|
|
|
|
|
|
|
|
# Now call the function on the empty file and assert
|
|
|
|
# the return is False instead of stack-tracing
|
|
|
|
self.assertFalse(filemod.line(empty_file.name,
|
|
|
|
content='foo',
|
|
|
|
match='bar',
|
|
|
|
mode='replace'))
|
|
|
|
|
|
|
|
# Close and remove the file
|
|
|
|
empty_file.close()
|
|
|
|
os.remove(empty_file.name)
|
|
|
|
|
2016-12-28 17:25:21 +00:00
|
|
|
def test_delete_line_in_empty_file(self):
|
|
|
|
'''
|
|
|
|
Tests that when calling file.line with ``mode=delete``,
|
|
|
|
the function doesn't stack trace if the file is empty.
|
|
|
|
Should return ``False``.
|
|
|
|
|
|
|
|
See Issue #38438.
|
|
|
|
'''
|
|
|
|
# Create an empty temporary named file
|
|
|
|
empty_file = tempfile.NamedTemporaryFile(delete=False,
|
|
|
|
mode='w+')
|
|
|
|
|
|
|
|
# Assert that the file was created and is empty
|
|
|
|
self.assertEqual(os.stat(empty_file.name).st_size, 0)
|
|
|
|
|
|
|
|
# Now call the function on the empty file and assert
|
|
|
|
# the return is False instead of stack-tracing
|
|
|
|
self.assertFalse(filemod.line(empty_file.name,
|
|
|
|
content='foo',
|
|
|
|
match='bar',
|
|
|
|
mode='delete'))
|
|
|
|
|
|
|
|
# Close and remove the file
|
|
|
|
empty_file.close()
|
|
|
|
os.remove(empty_file.name)
|
|
|
|
|
2017-10-30 12:36:16 +00:00
|
|
|
@patch('os.path.realpath', MagicMock())
|
|
|
|
@patch('os.path.isfile', MagicMock(return_value=True))
|
2017-10-30 12:47:57 +00:00
|
|
|
def test_line_modecheck_failure(self):
|
2017-10-30 12:36:16 +00:00
|
|
|
'''
|
2017-10-30 12:47:57 +00:00
|
|
|
Test for file.line for empty or wrong mode.
|
|
|
|
Calls unknown or empty mode and expects failure.
|
2017-10-30 12:36:16 +00:00
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
for mode, err_msg in [(None, 'How to process the file'), ('nonsense', 'Unknown mode')]:
|
|
|
|
with pytest.raises(CommandExecutionError) as cmd_err:
|
|
|
|
filemod.line('foo', mode=mode)
|
|
|
|
assert err_msg in str(cmd_err)
|
|
|
|
|
2017-10-30 12:48:22 +00:00
|
|
|
@patch('os.path.realpath', MagicMock())
|
|
|
|
@patch('os.path.isfile', MagicMock(return_value=True))
|
|
|
|
def test_line_no_content(self):
|
|
|
|
'''
|
|
|
|
Test for file.line for an empty content when not deleting anything.
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
for mode in ['insert', 'ensure', 'replace']:
|
|
|
|
with pytest.raises(CommandExecutionError) as cmd_err:
|
|
|
|
filemod.line('foo', mode=mode)
|
|
|
|
assert 'Content can only be empty if mode is "delete"' in str(cmd_err)
|
|
|
|
|
2017-10-30 13:14:02 +00:00
|
|
|
@patch('os.path.realpath', MagicMock())
|
|
|
|
@patch('os.path.isfile', MagicMock(return_value=True))
|
|
|
|
@patch('os.stat', MagicMock())
|
|
|
|
def test_line_insert_no_location_no_before_no_after(self):
|
|
|
|
'''
|
|
|
|
Test for file.line for insertion but define no location/before/after.
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
files_fopen = mock_open(read_data='test data')
|
|
|
|
with patch('salt.utils.files.fopen', files_fopen):
|
|
|
|
with pytest.raises(CommandExecutionError) as cmd_err:
|
|
|
|
filemod.line('foo', content='test content', mode='insert')
|
|
|
|
assert '"location" or "before/after"' in str(cmd_err)
|
|
|
|
|
2017-10-30 13:47:12 +00:00
|
|
|
def test_util_starts_till(self):
|
|
|
|
'''
|
|
|
|
Test for file._starts_till function.
|
|
|
|
|
|
|
|
:return:
|
|
|
|
'''
|
2017-10-30 14:40:58 +00:00
|
|
|
src = 'here is something'
|
|
|
|
assert 1 == filemod._starts_till(src=src, probe='here quite something else')
|
|
|
|
assert 0 == filemod._starts_till(src=src, probe='here is something')
|
|
|
|
assert -1 == filemod._starts_till(src=src, probe='and here is something')
|
2017-10-30 13:47:12 +00:00
|
|
|
|
2017-10-30 14:41:27 +00:00
|
|
|
@patch('os.path.realpath', MagicMock())
|
|
|
|
@patch('os.path.isfile', MagicMock(return_value=True))
|
|
|
|
@patch('os.stat', MagicMock())
|
2017-10-30 14:55:10 +00:00
|
|
|
def test_line_insert_after_no_pattern(self):
|
2017-10-30 14:41:27 +00:00
|
|
|
'''
|
2017-10-30 14:55:10 +00:00
|
|
|
Test for file.line for insertion after specific line, using no pattern.
|
2017-10-30 13:47:12 +00:00
|
|
|
|
2017-10-30 14:41:27 +00:00
|
|
|
See issue #38670
|
|
|
|
:return:
|
|
|
|
'''
|
2017-10-30 15:23:19 +00:00
|
|
|
file_content = 'file_roots:\n base:\n - /srv/salt'
|
2017-10-30 14:41:27 +00:00
|
|
|
file_modified = 'file_roots:\n base:\n - /srv/salt\n - /srv/custom'
|
|
|
|
cfg_content = '- /srv/custom'
|
|
|
|
files_fopen = mock_open(read_data=file_content)
|
|
|
|
with patch('salt.utils.files.fopen', files_fopen):
|
|
|
|
atomic_opener = mock_open()
|
|
|
|
with patch('salt.utils.atomicfile.atomic_open', atomic_opener):
|
|
|
|
filemod.line('foo', content=cfg_content, after='- /srv/salt', mode='insert')
|
|
|
|
assert 1 == len(atomic_opener().write.call_args_list)
|
|
|
|
assert file_modified == atomic_opener().write.call_args_list[0][0][0]
|
2017-02-14 18:26:23 +00:00
|
|
|
|
2017-10-30 14:57:36 +00:00
|
|
|
@patch('os.path.realpath', MagicMock())
|
|
|
|
@patch('os.path.isfile', MagicMock(return_value=True))
|
|
|
|
@patch('os.stat', MagicMock())
|
|
|
|
def test_line_insert_after_pattern(self):
|
|
|
|
'''
|
|
|
|
Test for file.line for insertion after specific line, using pattern.
|
|
|
|
|
|
|
|
See issue #38670
|
|
|
|
:return:
|
|
|
|
'''
|
2017-10-30 15:23:52 +00:00
|
|
|
file_content = 'file_boots:\n - /rusty\nfile_roots:\n base:\n - /srv/salt\n - /srv/sugar'
|
|
|
|
file_modified = 'file_boots:\n - /rusty\nfile_roots:\n custom:\n ' \
|
|
|
|
'- /srv/custom\n base:\n - /srv/salt\n - /srv/sugar'
|
2017-10-30 14:57:36 +00:00
|
|
|
cfg_content = ' custom:\n - /srv/custom'
|
2017-10-30 15:23:52 +00:00
|
|
|
for after_line in ['file_r.*', '.*roots']:
|
2017-10-30 14:57:36 +00:00
|
|
|
files_fopen = mock_open(read_data=file_content)
|
|
|
|
with patch('salt.utils.files.fopen', files_fopen):
|
|
|
|
atomic_opener = mock_open()
|
|
|
|
with patch('salt.utils.atomicfile.atomic_open', atomic_opener):
|
|
|
|
filemod.line('foo', content=cfg_content, after=after_line, mode='insert', indent=False)
|
|
|
|
assert 1 == len(atomic_opener().write.call_args_list)
|
|
|
|
assert file_modified == atomic_opener().write.call_args_list[0][0][0]
|
|
|
|
|
2017-10-30 15:24:57 +00:00
|
|
|
@patch('os.path.realpath', MagicMock())
|
|
|
|
@patch('os.path.isfile', MagicMock(return_value=True))
|
|
|
|
@patch('os.stat', MagicMock())
|
2017-10-30 15:47:33 +00:00
|
|
|
def test_line_insert_before(self):
|
2017-10-30 15:24:57 +00:00
|
|
|
'''
|
|
|
|
Test for file.line for insertion before specific line, using pattern and no patterns.
|
|
|
|
|
|
|
|
See issue #38670
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
file_content = 'file_roots:\n base:\n - /srv/salt\n - /srv/sugar'
|
|
|
|
file_modified = 'file_roots:\n base:\n - /srv/custom\n - /srv/salt\n - /srv/sugar'
|
|
|
|
cfg_content = '- /srv/custom'
|
|
|
|
for before_line in ['/srv/salt', '/srv/sa.*t', '/sr.*']:
|
|
|
|
files_fopen = mock_open(read_data=file_content)
|
|
|
|
with patch('salt.utils.files.fopen', files_fopen):
|
|
|
|
atomic_opener = mock_open()
|
|
|
|
with patch('salt.utils.atomicfile.atomic_open', atomic_opener):
|
|
|
|
filemod.line('foo', content=cfg_content, before=before_line, mode='insert')
|
|
|
|
assert 1 == len(atomic_opener().write.call_args_list)
|
2017-10-30 15:47:58 +00:00
|
|
|
assert file_modified == atomic_opener().write.call_args_list[0][0][0]
|
|
|
|
|
|
|
|
@patch('os.path.realpath', MagicMock())
|
|
|
|
@patch('os.path.isfile', MagicMock(return_value=True))
|
|
|
|
@patch('os.stat', MagicMock())
|
|
|
|
def test_line_insert_before_after(self):
|
|
|
|
'''
|
|
|
|
Test for file.line for insertion before specific line, using pattern and no patterns.
|
|
|
|
|
|
|
|
See issue #38670
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
file_content = 'file_roots:\n base:\n - /srv/salt\n - /srv/pepper\n - /srv/sugar'
|
|
|
|
file_modified = 'file_roots:\n base:\n - /srv/salt\n ' \
|
|
|
|
'- /srv/pepper\n - /srv/coriander\n - /srv/sugar'
|
|
|
|
cfg_content = '- /srv/coriander'
|
|
|
|
for b_line, a_line in [('/srv/sugar', '/srv/salt')]:
|
|
|
|
files_fopen = mock_open(read_data=file_content)
|
|
|
|
with patch('salt.utils.files.fopen', files_fopen):
|
|
|
|
atomic_opener = mock_open()
|
|
|
|
with patch('salt.utils.atomicfile.atomic_open', atomic_opener):
|
|
|
|
filemod.line('foo', content=cfg_content, before=b_line, after=a_line, mode='insert')
|
|
|
|
assert 1 == len(atomic_opener().write.call_args_list)
|
2017-10-30 17:35:06 +00:00
|
|
|
assert file_modified == atomic_opener().write.call_args_list[0][0][0]
|
|
|
|
|
|
|
|
@patch('os.path.realpath', MagicMock())
|
|
|
|
@patch('os.path.isfile', MagicMock(return_value=True))
|
|
|
|
@patch('os.stat', MagicMock())
|
|
|
|
def test_line_delete(self):
|
|
|
|
'''
|
|
|
|
Test for file.line for deletion of specific line
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
file_content = 'file_roots:\n base:\n - /srv/salt\n - /srv/pepper\n - /srv/sugar'
|
|
|
|
file_modified = 'file_roots:\n base:\n - /srv/salt\n - /srv/sugar'
|
|
|
|
for content in ['/srv/pepper', '/srv/pepp*', '/srv/p.*', '/sr.*pe.*']:
|
|
|
|
files_fopen = mock_open(read_data=file_content)
|
|
|
|
with patch('salt.utils.files.fopen', files_fopen):
|
|
|
|
atomic_opener = mock_open()
|
|
|
|
with patch('salt.utils.atomicfile.atomic_open', atomic_opener):
|
|
|
|
filemod.line('foo', content=content, mode='delete')
|
|
|
|
assert 1 == len(atomic_opener().write.call_args_list)
|
2017-10-30 17:49:14 +00:00
|
|
|
assert file_modified == atomic_opener().write.call_args_list[0][0][0]
|
|
|
|
|
|
|
|
@patch('os.path.realpath', MagicMock())
|
|
|
|
@patch('os.path.isfile', MagicMock(return_value=True))
|
|
|
|
@patch('os.stat', MagicMock())
|
|
|
|
def test_line_replace(self):
|
|
|
|
'''
|
|
|
|
Test for file.line for replacement of specific line
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
file_content = 'file_roots:\n base:\n - /srv/salt\n - /srv/pepper\n - /srv/sugar'
|
|
|
|
file_modified = 'file_roots:\n base:\n - /srv/salt\n - /srv/natrium-chloride\n - /srv/sugar'
|
|
|
|
for match in ['/srv/pepper', '/srv/pepp*', '/srv/p.*', '/sr.*pe.*']:
|
|
|
|
files_fopen = mock_open(read_data=file_content)
|
|
|
|
with patch('salt.utils.files.fopen', files_fopen):
|
|
|
|
atomic_opener = mock_open()
|
|
|
|
with patch('salt.utils.atomicfile.atomic_open', atomic_opener):
|
|
|
|
filemod.line('foo', content='- /srv/natrium-chloride', match=match, mode='replace')
|
|
|
|
assert 1 == len(atomic_opener().write.call_args_list)
|
2017-10-30 15:24:57 +00:00
|
|
|
assert file_modified == atomic_opener().write.call_args_list[0][0][0]
|
|
|
|
|
2017-10-30 14:57:36 +00:00
|
|
|
|
2017-02-19 15:35:30 +00:00
|
|
|
class FileBasicsTestCase(TestCase, LoaderModuleMockMixin):
|
2017-03-22 12:12:36 +00:00
|
|
|
def setup_loader_modules(self):
|
2017-02-19 15:35:30 +00:00
|
|
|
return {
|
2017-03-22 12:12:36 +00:00
|
|
|
filemod: {
|
|
|
|
'__salt__': {
|
|
|
|
'config.manage_mode': configmod.manage_mode,
|
|
|
|
'cmd.run': cmdmod.run,
|
|
|
|
'cmd.run_all': cmdmod.run_all
|
|
|
|
},
|
|
|
|
'__opts__': {
|
|
|
|
'test': False,
|
|
|
|
'file_roots': {'base': 'tmp'},
|
|
|
|
'pillar_roots': {'base': 'tmp'},
|
|
|
|
'cachedir': 'tmp',
|
|
|
|
'grains': {},
|
|
|
|
},
|
|
|
|
'__grains__': {'kernel': 'Linux'}
|
|
|
|
}
|
2017-02-19 15:35:30 +00:00
|
|
|
}
|
|
|
|
|
2017-02-14 02:10:28 +00:00
|
|
|
def setUp(self):
|
|
|
|
self.directory = tempfile.mkdtemp()
|
2017-03-27 15:25:09 +00:00
|
|
|
self.addCleanup(shutil.rmtree, self.directory)
|
|
|
|
self.addCleanup(delattr, self, 'directory')
|
2017-02-14 02:10:28 +00:00
|
|
|
with tempfile.NamedTemporaryFile(delete=False, mode='w+') as self.tfile:
|
|
|
|
self.tfile.write('Hi hello! I am a file.')
|
|
|
|
self.tfile.close()
|
2017-03-27 15:25:09 +00:00
|
|
|
self.addCleanup(os.remove, self.tfile.name)
|
|
|
|
self.addCleanup(delattr, self, 'tfile')
|
|
|
|
self.myfile = os.path.join(TMP, 'myfile')
|
2017-07-18 16:31:01 +00:00
|
|
|
with salt.utils.files.fopen(self.myfile, 'w+') as fp:
|
2017-03-27 15:25:09 +00:00
|
|
|
fp.write('Hello\n')
|
|
|
|
self.addCleanup(os.remove, self.myfile)
|
|
|
|
self.addCleanup(delattr, self, 'myfile')
|
2017-02-14 02:10:28 +00:00
|
|
|
|
2017-10-14 01:52:56 +00:00
|
|
|
@skipIf(salt.utils.platform.is_windows(), 'os.symlink is not available on Windows')
|
2017-02-14 02:10:28 +00:00
|
|
|
def test_symlink_already_in_desired_state(self):
|
|
|
|
os.symlink(self.tfile.name, self.directory + '/a_link')
|
2017-03-27 15:25:09 +00:00
|
|
|
self.addCleanup(os.remove, self.directory + '/a_link')
|
2017-02-14 02:10:28 +00:00
|
|
|
result = filemod.symlink(self.tfile.name, self.directory + '/a_link')
|
|
|
|
self.assertTrue(result)
|
2017-03-27 15:25:09 +00:00
|
|
|
|
2017-04-10 13:00:57 +00:00
|
|
|
def test_source_list_for_list_returns_file_from_dict_via_http(self):
|
|
|
|
with patch('salt.modules.file.os.remove') as remove:
|
|
|
|
remove.return_value = None
|
|
|
|
with patch.dict(filemod.__salt__, {'cp.list_master': MagicMock(return_value=[]),
|
|
|
|
'cp.list_master_dirs': MagicMock(return_value=[]),
|
|
|
|
'cp.cache_file': MagicMock(return_value='/tmp/http.conf')}):
|
|
|
|
ret = filemod.source_list(
|
|
|
|
[{'http://t.est.com/http/httpd.conf': 'filehash'}], '', 'base')
|
|
|
|
self.assertEqual(list(ret), ['http://t.est.com/http/httpd.conf', 'filehash'])
|
2017-03-27 15:25:09 +00:00
|
|
|
|
|
|
|
def test_source_list_for_list_returns_existing_file(self):
|
|
|
|
with patch.dict(filemod.__salt__, {'cp.list_master': MagicMock(return_value=['http/httpd.conf.fallback']),
|
|
|
|
'cp.list_master_dirs': MagicMock(return_value=[])}):
|
|
|
|
ret = filemod.source_list(['salt://http/httpd.conf',
|
|
|
|
'salt://http/httpd.conf.fallback'],
|
|
|
|
'filehash', 'base')
|
|
|
|
self.assertEqual(list(ret), ['salt://http/httpd.conf.fallback', 'filehash'])
|
|
|
|
|
|
|
|
def test_source_list_for_list_returns_file_from_other_env(self):
|
|
|
|
def list_master(env):
|
|
|
|
dct = {'base': [], 'dev': ['http/httpd.conf']}
|
|
|
|
return dct[env]
|
|
|
|
|
|
|
|
with patch.dict(filemod.__salt__, {'cp.list_master': MagicMock(side_effect=list_master),
|
|
|
|
'cp.list_master_dirs': MagicMock(return_value=[])}):
|
|
|
|
ret = filemod.source_list(['salt://http/httpd.conf?saltenv=dev',
|
|
|
|
'salt://http/httpd.conf.fallback'],
|
|
|
|
'filehash', 'base')
|
|
|
|
self.assertEqual(list(ret), ['salt://http/httpd.conf?saltenv=dev', 'filehash'])
|
|
|
|
|
|
|
|
def test_source_list_for_list_returns_file_from_dict(self):
|
|
|
|
with patch.dict(filemod.__salt__, {'cp.list_master': MagicMock(return_value=['http/httpd.conf']),
|
|
|
|
'cp.list_master_dirs': MagicMock(return_value=[])}):
|
|
|
|
ret = filemod.source_list(
|
|
|
|
[{'salt://http/httpd.conf': ''}], 'filehash', 'base')
|
|
|
|
self.assertEqual(list(ret), ['salt://http/httpd.conf', 'filehash'])
|
|
|
|
|
|
|
|
def test_source_list_for_list_returns_existing_local_file_slash(self):
|
|
|
|
with patch.dict(filemod.__salt__, {'cp.list_master': MagicMock(return_value=[]),
|
|
|
|
'cp.list_master_dirs': MagicMock(return_value=[])}):
|
|
|
|
ret = filemod.source_list([self.myfile + '-foo',
|
|
|
|
self.myfile],
|
|
|
|
'filehash', 'base')
|
|
|
|
self.assertEqual(list(ret), [self.myfile, 'filehash'])
|
|
|
|
|
|
|
|
def test_source_list_for_list_returns_existing_local_file_proto(self):
|
|
|
|
with patch.dict(filemod.__salt__, {'cp.list_master': MagicMock(return_value=[]),
|
|
|
|
'cp.list_master_dirs': MagicMock(return_value=[])}):
|
|
|
|
ret = filemod.source_list(['file://' + self.myfile + '-foo',
|
|
|
|
'file://' + self.myfile],
|
|
|
|
'filehash', 'base')
|
|
|
|
self.assertEqual(list(ret), ['file://' + self.myfile, 'filehash'])
|
|
|
|
|
|
|
|
def test_source_list_for_list_returns_local_file_slash_from_dict(self):
|
|
|
|
with patch.dict(filemod.__salt__, {'cp.list_master': MagicMock(return_value=[]),
|
|
|
|
'cp.list_master_dirs': MagicMock(return_value=[])}):
|
|
|
|
ret = filemod.source_list(
|
|
|
|
[{self.myfile: ''}], 'filehash', 'base')
|
|
|
|
self.assertEqual(list(ret), [self.myfile, 'filehash'])
|
|
|
|
|
|
|
|
def test_source_list_for_list_returns_local_file_proto_from_dict(self):
|
|
|
|
with patch.dict(filemod.__salt__, {'cp.list_master': MagicMock(return_value=[]),
|
|
|
|
'cp.list_master_dirs': MagicMock(return_value=[])}):
|
|
|
|
ret = filemod.source_list(
|
|
|
|
[{'file://' + self.myfile: ''}], 'filehash', 'base')
|
|
|
|
self.assertEqual(list(ret), ['file://' + self.myfile, 'filehash'])
|