mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
3184168365
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.
174 lines
5.3 KiB
Python
174 lines
5.3 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
|
|
|
|
|
|
tests.integration.shell.cp
|
|
~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
'''
|
|
|
|
# Import python libs
|
|
from __future__ import absolute_import
|
|
import errno
|
|
import os
|
|
import pipes
|
|
import shutil
|
|
import tempfile
|
|
|
|
# Import 3rd-party libs
|
|
import yaml
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.case import ShellCase
|
|
from tests.support.paths import TMP
|
|
from tests.support.mixins import ShellCaseCommonTestsMixin
|
|
|
|
# Import salt libs
|
|
import salt.utils.files
|
|
|
|
# Import 3rd-party libs
|
|
from salt.ext import six
|
|
|
|
|
|
class CopyTest(ShellCase, ShellCaseCommonTestsMixin):
|
|
|
|
_call_binary_ = 'salt-cp'
|
|
|
|
def test_cp_testfile(self):
|
|
'''
|
|
test salt-cp
|
|
'''
|
|
minions = []
|
|
for line in self.run_salt('--out yaml "*" test.ping'):
|
|
if not line:
|
|
continue
|
|
data = yaml.load(line)
|
|
minions.extend(data.keys())
|
|
|
|
self.assertNotEqual(minions, [])
|
|
|
|
testfile = os.path.abspath(
|
|
os.path.join(
|
|
os.path.dirname(os.path.dirname(__file__)),
|
|
'files', 'file', 'base', 'testfile'
|
|
)
|
|
)
|
|
with salt.utils.files.fopen(testfile, 'r') as fh_:
|
|
testfile_contents = fh_.read()
|
|
|
|
for idx, minion in enumerate(minions):
|
|
ret = self.run_salt(
|
|
'--out yaml {0} file.directory_exists {1}'.format(
|
|
pipes.quote(minion), TMP
|
|
)
|
|
)
|
|
data = yaml.load('\n'.join(ret))
|
|
if data[minion] is False:
|
|
ret = self.run_salt(
|
|
'--out yaml {0} file.makedirs {1}'.format(
|
|
pipes.quote(minion),
|
|
TMP
|
|
)
|
|
)
|
|
|
|
data = yaml.load('\n'.join(ret))
|
|
self.assertTrue(data[minion])
|
|
|
|
minion_testfile = os.path.join(
|
|
TMP, 'cp_{0}_testfile'.format(idx)
|
|
)
|
|
|
|
ret = self.run_cp('--out pprint {0} {1} {2}'.format(
|
|
pipes.quote(minion),
|
|
pipes.quote(testfile),
|
|
pipes.quote(minion_testfile)
|
|
))
|
|
|
|
data = yaml.load('\n'.join(ret))
|
|
for part in six.itervalues(data):
|
|
self.assertTrue(part[minion_testfile])
|
|
|
|
ret = self.run_salt(
|
|
'--out yaml {0} file.file_exists {1}'.format(
|
|
pipes.quote(minion),
|
|
pipes.quote(minion_testfile)
|
|
)
|
|
)
|
|
data = yaml.load('\n'.join(ret))
|
|
self.assertTrue(data[minion])
|
|
|
|
ret = self.run_salt(
|
|
'--out yaml {0} file.contains {1} {2}'.format(
|
|
pipes.quote(minion),
|
|
pipes.quote(minion_testfile),
|
|
pipes.quote(testfile_contents)
|
|
)
|
|
)
|
|
data = yaml.load('\n'.join(ret))
|
|
self.assertTrue(data[minion])
|
|
ret = self.run_salt(
|
|
'--out yaml {0} file.remove {1}'.format(
|
|
pipes.quote(minion),
|
|
pipes.quote(minion_testfile)
|
|
)
|
|
)
|
|
data = yaml.load('\n'.join(ret))
|
|
self.assertTrue(data[minion])
|
|
|
|
def test_issue_7754(self):
|
|
config_dir = os.path.join(TMP, 'issue-7754')
|
|
|
|
try:
|
|
os.makedirs(config_dir)
|
|
except OSError as exc:
|
|
if exc.errno != errno.EEXIST:
|
|
raise
|
|
|
|
config_file_name = 'master'
|
|
with salt.utils.files.fopen(self.get_config_file_path(config_file_name), 'r') as fhr:
|
|
config = yaml.load(fhr.read())
|
|
config['log_file'] = 'file:///dev/log/LOG_LOCAL3'
|
|
with salt.utils.files.fopen(os.path.join(config_dir, config_file_name), 'w') as fhw:
|
|
fhw.write(
|
|
yaml.dump(config, default_flow_style=False)
|
|
)
|
|
|
|
try:
|
|
fd_, fn_ = tempfile.mkstemp()
|
|
os.close(fd_)
|
|
|
|
with salt.utils.files.fopen(fn_, 'w') as fp_:
|
|
fp_.write('Hello world!\n')
|
|
|
|
ret = self.run_script(
|
|
self._call_binary_,
|
|
'--out pprint --config-dir {0} \'*\' {1} {0}/{2}'.format(
|
|
config_dir,
|
|
fn_,
|
|
os.path.basename(fn_),
|
|
),
|
|
catch_stderr=True,
|
|
with_retcode=True
|
|
)
|
|
|
|
self.assertIn('minion', '\n'.join(ret[0]))
|
|
self.assertIn('sub_minion', '\n'.join(ret[0]))
|
|
self.assertFalse(os.path.isdir(os.path.join(config_dir, 'file:')))
|
|
except AssertionError:
|
|
if os.path.exists('/dev/log') and ret[2] != 2:
|
|
# If there's a syslog device and the exit code was not 2, 'No
|
|
# such file or directory', raise the error
|
|
raise
|
|
self.assertIn(
|
|
'Failed to setup the Syslog logging handler', '\n'.join(ret[1])
|
|
)
|
|
self.assertEqual(ret[2], 2)
|
|
finally:
|
|
try:
|
|
os.remove(fn_)
|
|
except OSError as exc:
|
|
if exc.errno != errno.ENOENT:
|
|
raise
|
|
if os.path.isdir(config_dir):
|
|
shutil.rmtree(config_dir)
|