mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +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.
151 lines
5.5 KiB
Python
151 lines
5.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Import python libs
|
|
from __future__ import absolute_import, print_function
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.mixins import LoaderModuleMockMixin
|
|
from tests.support.unit import skipIf, TestCase
|
|
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, Mock, patch
|
|
|
|
# Import salt libs
|
|
from salt.ext import six
|
|
import salt.modules.deb_postgres as deb_postgres
|
|
|
|
LSCLUSTER = '''\
|
|
8.4 main 5432 online postgres /srv/8.4/main \
|
|
/var/log/postgresql/postgresql-8.4-main.log
|
|
9.1 main 5433 online postgres /srv/9.1/main \
|
|
/var/log/postgresql/postgresql-9.1-main.log
|
|
'''
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class PostgresClusterTestCase(TestCase, LoaderModuleMockMixin):
|
|
|
|
def setup_loader_modules(self):
|
|
self.cmd_run_all_mock = Mock(return_value={'stdout': LSCLUSTER})
|
|
self.addCleanup(delattr, self, 'cmd_run_all_mock')
|
|
patcher = patch('salt.utils.path.which', Mock(return_value='/usr/bin/pg_createcluster'))
|
|
patcher.start()
|
|
self.addCleanup(patcher.stop)
|
|
return {
|
|
deb_postgres: {
|
|
'__salt__': {
|
|
'config.option': Mock(),
|
|
'cmd.run_all': self.cmd_run_all_mock,
|
|
'file.chown': Mock(),
|
|
'file.remove': Mock(),
|
|
}
|
|
}
|
|
}
|
|
|
|
def test_cluster_create(self):
|
|
deb_postgres.cluster_create(
|
|
'9.3',
|
|
'main',
|
|
port='5432',
|
|
locale='fr_FR',
|
|
encoding='UTF-8',
|
|
datadir='/opt/postgresql'
|
|
)
|
|
cmdstr = '/usr/bin/pg_createcluster ' \
|
|
'--port 5432 --locale fr_FR --encoding UTF-8 ' \
|
|
'--datadir /opt/postgresql ' \
|
|
'9.3 main'
|
|
self.assertEqual(cmdstr, self.cmd_run_all_mock.call_args[0][0])
|
|
|
|
# XXX version should be a string but from cmdline you get a float
|
|
# def test_cluster_create_with_float(self):
|
|
# self.assertRaises(AssertionError, deb_postgres.cluster_create,
|
|
# (9.3,'main',),
|
|
# dict(port='5432',
|
|
# locale='fr_FR',
|
|
# encoding='UTF-8',
|
|
# datadir='/opt/postgresql'))
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class PostgresLsClusterTestCase(TestCase, LoaderModuleMockMixin):
|
|
|
|
def setup_loader_modules(self):
|
|
self.cmd_run_all_mock = Mock(return_value={'stdout': LSCLUSTER})
|
|
self.addCleanup(delattr, self, 'cmd_run_all_mock')
|
|
patcher = patch('salt.utils.path.which', Mock(return_value='/usr/bin/pg_lsclusters'))
|
|
patcher.start()
|
|
self.addCleanup(patcher.stop)
|
|
return {
|
|
deb_postgres: {
|
|
'__salt__': {
|
|
'config.option': Mock(),
|
|
'cmd.run_all': self.cmd_run_all_mock,
|
|
'file.chown': Mock(),
|
|
'file.remove': Mock(),
|
|
}
|
|
}
|
|
}
|
|
|
|
def test_parse_pg_lsclusters(self):
|
|
stdout = LSCLUSTER
|
|
self.maxDiff = None
|
|
self.assertDictEqual(
|
|
{('8.4/main'): {
|
|
'port': 5432,
|
|
'status': 'online',
|
|
'user': 'postgres',
|
|
'datadir': '/srv/8.4/main',
|
|
'log': '/var/log/postgresql/postgresql-8.4-main.log'},
|
|
('9.1/main'): {
|
|
'port': 5433,
|
|
'status': 'online',
|
|
'user': 'postgres',
|
|
'datadir': '/srv/9.1/main',
|
|
'log': '/var/log/postgresql/postgresql-9.1-main.log'}},
|
|
deb_postgres._parse_pg_lscluster(stdout))
|
|
|
|
def test_cluster_list(self):
|
|
return_list = deb_postgres.cluster_list()
|
|
self.assertEqual('/usr/bin/pg_lsclusters --no-header',
|
|
self.cmd_run_all_mock.call_args[0][0])
|
|
if six.PY2:
|
|
# Python 3 returns iterable views (dict_keys in this case) on
|
|
# dict.keys() calls instead of lists. We should only perform
|
|
# this check in Python 2.
|
|
self.assertIsInstance(return_list, list)
|
|
return_dict = deb_postgres.cluster_list(verbose=True)
|
|
self.assertIsInstance(return_dict, dict)
|
|
|
|
def test_cluster_exists(self):
|
|
self.assertTrue(deb_postgres.cluster_exists('8.4') is True)
|
|
self.assertTrue(deb_postgres.cluster_exists('8.4', 'main') is True)
|
|
self.assertFalse(deb_postgres.cluster_exists('3.4', 'main'))
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class PostgresDeleteClusterTestCase(TestCase, LoaderModuleMockMixin):
|
|
|
|
def setup_loader_modules(self):
|
|
self.cmd_run_all_mock = Mock(return_value={'stdout': LSCLUSTER})
|
|
self.addCleanup(delattr, self, 'cmd_run_all_mock')
|
|
patcher = patch('salt.utils.path.which', Mock(return_value='/usr/bin/pg_dropcluster'))
|
|
patcher.start()
|
|
self.addCleanup(patcher.stop)
|
|
return {
|
|
deb_postgres: {
|
|
'__salt__': {
|
|
'config.option': Mock(),
|
|
'cmd.run_all': self.cmd_run_all_mock,
|
|
'file.chown': Mock(),
|
|
'file.remove': Mock(),
|
|
}
|
|
}
|
|
}
|
|
|
|
def test_cluster_delete(self):
|
|
deb_postgres.cluster_remove('9.3', 'main')
|
|
self.assertEqual('/usr/bin/pg_dropcluster 9.3 main',
|
|
self.cmd_run_all_mock.call_args[0][0])
|
|
deb_postgres.cluster_remove('9.3', 'main', stop=True)
|
|
self.assertEqual('/usr/bin/pg_dropcluster --stop 9.3 main',
|
|
self.cmd_run_all_mock.call_args[0][0])
|