mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +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.
66 lines
2.0 KiB
Python
66 lines
2.0 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Eric Radman <ericshane@eradman.com`
|
|
'''
|
|
|
|
# Import python libs
|
|
from __future__ import absolute_import
|
|
import tempfile
|
|
import os.path
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.unit import TestCase, skipIf
|
|
from tests.support.mock import NO_MOCK, NO_MOCK_REASON
|
|
|
|
# Import Salt libs
|
|
import tests.integration as integration
|
|
import salt.utils.thin as thin
|
|
from salt.client import ssh
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class SSHSingleTests(TestCase):
|
|
def setUp(self):
|
|
self.tmp_cachedir = tempfile.mkdtemp(dir=integration.TMP)
|
|
|
|
def test_single_opts(self):
|
|
''' Sanity check for ssh.Single options
|
|
'''
|
|
argv = ['ssh.set_auth_key', 'root', 'hobn+amNAXSBTiOXEqlBjGB...rsa root@master']
|
|
opts = {
|
|
'argv': argv,
|
|
'__role': 'master',
|
|
'cachedir': self.tmp_cachedir,
|
|
'extension_modules': os.path.join(self.tmp_cachedir, 'extmods'),
|
|
}
|
|
target = {
|
|
'passwd': 'abc123',
|
|
'ssh_options': None,
|
|
'sudo': False,
|
|
'identities_only': False,
|
|
'host': 'login1',
|
|
'user': 'root',
|
|
'timeout': 65,
|
|
'remote_port_forwards': None,
|
|
'sudo_user': '',
|
|
'port': '22',
|
|
'priv': '/etc/salt/pki/master/ssh/salt-ssh.rsa'
|
|
}
|
|
|
|
single = ssh.Single(
|
|
opts,
|
|
opts['argv'],
|
|
'localhost',
|
|
mods={},
|
|
fsclient=None,
|
|
thin=thin.thin_path(opts['cachedir']),
|
|
mine=False,
|
|
**target)
|
|
|
|
self.assertEqual(single.shell._ssh_opts(), '')
|
|
self.assertEqual(single.shell._cmd_str('date +%s'), 'ssh login1 '
|
|
'-o KbdInteractiveAuthentication=no -o '
|
|
'PasswordAuthentication=yes -o ConnectTimeout=65 -o Port=22 '
|
|
'-o IdentityFile=/etc/salt/pki/master/ssh/salt-ssh.rsa '
|
|
'-o User=root date +%s')
|