2014-01-19 00:07:13 +00:00
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
|
2014-11-21 19:05:13 +00:00
|
|
|
# Import python libs
|
|
|
|
|
from __future__ import absolute_import
|
|
|
|
|
|
2014-01-19 00:07:13 +00:00
|
|
|
# Import Salt Testing libs
|
2017-04-10 13:00:57 +00:00
|
|
|
from tests.support.mixins import LoaderModuleMockMixin
|
2017-02-27 13:58:07 +00:00
|
|
|
from tests.support.unit import skipIf, TestCase
|
|
|
|
|
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, Mock, MagicMock, patch
|
2014-01-19 00:07:13 +00:00
|
|
|
|
|
|
|
|
# Import salt libs
|
2017-03-21 17:15:36 +00:00
|
|
|
import salt.modules.postgres as postgresmod
|
|
|
|
|
import salt.states.postgres_database as postgres_database
|
|
|
|
|
import salt.states.postgres_user as postgres_user
|
|
|
|
|
import salt.states.postgres_group as postgres_group
|
|
|
|
|
import salt.states.postgres_extension as postgres_extension
|
|
|
|
|
import salt.states.postgres_schema as postgres_schema
|
2014-01-19 00:07:13 +00:00
|
|
|
|
|
|
|
|
|
2014-05-28 12:56:57 +00:00
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
2017-04-10 13:00:57 +00:00
|
|
|
class PostgresUserTestCase(TestCase, LoaderModuleMockMixin):
|
|
|
|
|
|
|
|
|
|
def setup_loader_modules(self):
|
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
|
|
|
patcher = patch('salt.utils.path.which', Mock(return_value='/usr/bin/pgsql'))
|
2017-04-10 13:00:57 +00:00
|
|
|
patcher.start()
|
|
|
|
|
self.addCleanup(patcher.stop)
|
|
|
|
|
self.salt_stub = {
|
|
|
|
|
'config.option': Mock(),
|
|
|
|
|
'cmd.run_all': Mock(),
|
|
|
|
|
'file.chown': Mock(),
|
|
|
|
|
'file.remove': Mock(),
|
|
|
|
|
}
|
|
|
|
|
self.addCleanup(delattr, self, 'salt_stub')
|
|
|
|
|
return {
|
|
|
|
|
postgres_database: {},
|
|
|
|
|
postgres_group: {},
|
|
|
|
|
postgres_extension: {},
|
|
|
|
|
postgres_schema: {},
|
|
|
|
|
postgres_user: {
|
|
|
|
|
'__grains__': {'os_family': 'Linux'},
|
|
|
|
|
'__salt__': self.salt_stub,
|
|
|
|
|
'__opts__': {'test': False},
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-05-28 12:56:57 +00:00
|
|
|
def test_present__creation(self):
|
|
|
|
|
# test=True
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_user.__salt__, {'postgres.role_get': Mock(return_value=None),
|
|
|
|
|
'postgres.user_create': MagicMock()}):
|
|
|
|
|
with patch.dict(postgres_user.__opts__, {'test': True}):
|
|
|
|
|
ret = postgres_user.present('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'User foo is set to be created',
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': None}
|
|
|
|
|
)
|
|
|
|
|
self.assertEqual(self.salt_stub['postgres.user_create'].call_count, 0)
|
|
|
|
|
|
|
|
|
|
# test=False
|
2014-05-28 12:56:57 +00:00
|
|
|
ret = postgres_user.present('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
2017-04-10 13:00:57 +00:00
|
|
|
{'comment': 'The user foo has been created',
|
|
|
|
|
'changes': {'foo': 'Present'}, 'name': 'foo', 'result': True}
|
2014-05-28 12:56:57 +00:00
|
|
|
)
|
2017-04-10 13:00:57 +00:00
|
|
|
self.salt_stub['postgres.user_create'].assert_called_once_with(username='foo',
|
|
|
|
|
superuser=None,
|
|
|
|
|
encrypted=True,
|
|
|
|
|
runas=None,
|
|
|
|
|
inherit=None,
|
|
|
|
|
rolepassword=None,
|
|
|
|
|
port=None,
|
|
|
|
|
replication=None,
|
|
|
|
|
host=None,
|
|
|
|
|
createroles=None,
|
|
|
|
|
user=None,
|
|
|
|
|
groups=None,
|
|
|
|
|
maintenance_db=None,
|
|
|
|
|
login=None,
|
|
|
|
|
password=None,
|
2017-08-12 11:48:12 +00:00
|
|
|
valid_until=None,
|
2017-04-10 13:00:57 +00:00
|
|
|
createdb=None)
|
|
|
|
|
|
2014-05-28 12:56:57 +00:00
|
|
|
def test_present__update(self):
|
|
|
|
|
# test=True
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_user.__salt__, {'postgres.role_get': Mock(return_value={
|
|
|
|
|
'can create databases': False,
|
|
|
|
|
'can create roles': False,
|
|
|
|
|
'can login': False,
|
|
|
|
|
'can update system catalogs': False,
|
|
|
|
|
'connections': None,
|
|
|
|
|
'defaults variables': {},
|
|
|
|
|
'expiry time': None,
|
|
|
|
|
'inherits privileges': True,
|
|
|
|
|
'replication': False,
|
|
|
|
|
'superuser': False,
|
|
|
|
|
}),
|
|
|
|
|
'postgres.user_update': MagicMock()}):
|
|
|
|
|
with patch.dict(postgres_user.__opts__, {'test': True}):
|
|
|
|
|
ret = postgres_user.present('foo', login=True, replication=False)
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'User foo is set to be updated',
|
|
|
|
|
'changes': {'foo': {'login': True}}, 'name': 'foo', 'result': None}
|
|
|
|
|
)
|
|
|
|
|
self.assertEqual(self.salt_stub['postgres.user_update'].call_count, 0)
|
|
|
|
|
|
|
|
|
|
# test=False
|
2014-05-28 12:56:57 +00:00
|
|
|
ret = postgres_user.present('foo', login=True, replication=False)
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
2017-04-10 13:00:57 +00:00
|
|
|
{'comment': 'The user foo has been updated',
|
|
|
|
|
'changes': {'foo': {'login': True}}, 'name': 'foo', 'result': True}
|
2014-05-28 12:56:57 +00:00
|
|
|
)
|
2017-04-10 13:00:57 +00:00
|
|
|
self.salt_stub['postgres.user_update'].assert_called_once_with(username='foo',
|
|
|
|
|
superuser=None,
|
|
|
|
|
encrypted=True,
|
|
|
|
|
runas=None,
|
|
|
|
|
inherit=None,
|
|
|
|
|
rolepassword=None,
|
|
|
|
|
port=None,
|
|
|
|
|
replication=False,
|
|
|
|
|
host=None,
|
|
|
|
|
createroles=None,
|
|
|
|
|
user=None,
|
|
|
|
|
groups=None,
|
|
|
|
|
maintenance_db=None,
|
|
|
|
|
login=True,
|
|
|
|
|
password=None,
|
2017-08-12 11:48:12 +00:00
|
|
|
valid_until=None,
|
2017-04-10 13:00:57 +00:00
|
|
|
createdb=None)
|
|
|
|
|
|
2014-05-28 12:56:57 +00:00
|
|
|
def test_present__no_update(self):
|
|
|
|
|
# test=True
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_user.__salt__, {'postgres.role_get': Mock(return_value={
|
|
|
|
|
'can create databases': False,
|
|
|
|
|
'can create roles': False,
|
|
|
|
|
'can login': False,
|
|
|
|
|
'can update system catalogs': False,
|
|
|
|
|
'connections': None,
|
|
|
|
|
'defaults variables': {},
|
|
|
|
|
'expiry time': None,
|
|
|
|
|
'inherits privileges': True,
|
|
|
|
|
'replication': False,
|
|
|
|
|
'superuser': False,
|
|
|
|
|
}),
|
|
|
|
|
'postgres.user_update': MagicMock()}):
|
|
|
|
|
with patch.dict(postgres_user.__opts__, {'test': True}):
|
|
|
|
|
ret = postgres_user.present('foo', login=False, replication=False)
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'User foo is already present',
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': True}
|
|
|
|
|
)
|
|
|
|
|
self.assertEqual(self.salt_stub['postgres.user_update'].call_count, 0)
|
|
|
|
|
|
|
|
|
|
# test=False
|
2014-05-28 12:56:57 +00:00
|
|
|
ret = postgres_user.present('foo', login=False, replication=False)
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'User foo is already present',
|
2014-05-28 13:05:50 +00:00
|
|
|
'changes': {}, 'name': 'foo', 'result': True}
|
2014-05-28 12:56:57 +00:00
|
|
|
)
|
2017-04-10 13:00:57 +00:00
|
|
|
self.assertEqual(self.salt_stub['postgres.user_update'].call_count, 0)
|
2014-05-28 12:56:57 +00:00
|
|
|
|
|
|
|
|
|
2014-05-28 13:11:24 +00:00
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
2017-04-10 13:00:57 +00:00
|
|
|
class PostgresGroupTestCase(TestCase, LoaderModuleMockMixin):
|
|
|
|
|
|
|
|
|
|
def setup_loader_modules(self):
|
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
|
|
|
patcher = patch('salt.utils.path.which', Mock(return_value='/usr/bin/pgsql'))
|
2017-04-10 13:00:57 +00:00
|
|
|
patcher.start()
|
|
|
|
|
self.addCleanup(patcher.stop)
|
|
|
|
|
self.salt_stub = {
|
|
|
|
|
'config.option': Mock(),
|
|
|
|
|
'cmd.run_all': Mock(),
|
|
|
|
|
'file.chown': Mock(),
|
|
|
|
|
'file.remove': Mock(),
|
|
|
|
|
}
|
|
|
|
|
self.addCleanup(delattr, self, 'salt_stub')
|
|
|
|
|
return {
|
|
|
|
|
postgres_database: {},
|
|
|
|
|
postgres_user: {},
|
|
|
|
|
postgres_extension: {},
|
|
|
|
|
postgres_schema: {},
|
|
|
|
|
postgres_group: {
|
|
|
|
|
'__grains__': {'os_family': 'Linux'},
|
|
|
|
|
'__salt__': self.salt_stub,
|
|
|
|
|
'__opts__': {'test': False},
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-05-28 13:11:24 +00:00
|
|
|
def test_present__creation(self):
|
|
|
|
|
# test=True
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_group.__salt__, {'postgres.role_get': Mock(return_value=None),
|
|
|
|
|
'postgres.group_create': MagicMock()}):
|
|
|
|
|
with patch.dict(postgres_group.__opts__, {'test': True}):
|
|
|
|
|
ret = postgres_group.present('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'Group foo is set to be created',
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': None}
|
|
|
|
|
)
|
|
|
|
|
self.assertEqual(self.salt_stub['postgres.group_create'].call_count, 0)
|
|
|
|
|
|
|
|
|
|
# test=False
|
2014-05-28 13:11:24 +00:00
|
|
|
ret = postgres_group.present('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
2017-04-10 13:00:57 +00:00
|
|
|
{'comment': 'The group foo has been created',
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': True}
|
2014-05-28 13:11:24 +00:00
|
|
|
)
|
2017-04-10 13:00:57 +00:00
|
|
|
self.salt_stub['postgres.group_create'].assert_called_once_with(superuser=None,
|
|
|
|
|
replication=None,
|
|
|
|
|
encrypted=True,
|
|
|
|
|
runas=None,
|
|
|
|
|
inherit=None,
|
|
|
|
|
rolepassword=None,
|
|
|
|
|
port=None,
|
|
|
|
|
groupname='foo',
|
|
|
|
|
host=None,
|
|
|
|
|
createroles=None,
|
|
|
|
|
user=None,
|
|
|
|
|
groups=None,
|
|
|
|
|
maintenance_db=None,
|
|
|
|
|
login=None,
|
|
|
|
|
password=None,
|
|
|
|
|
createdb=None)
|
|
|
|
|
|
2014-05-28 13:11:24 +00:00
|
|
|
def test_present__update(self):
|
|
|
|
|
# test=True
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_group.__salt__, {'postgres.role_get': Mock(return_value={
|
|
|
|
|
'can create databases': False,
|
|
|
|
|
'can create roles': False,
|
|
|
|
|
'can login': False,
|
|
|
|
|
'can update system catalogs': False,
|
|
|
|
|
'connections': None,
|
|
|
|
|
'defaults variables': {},
|
|
|
|
|
'expiry time': None,
|
|
|
|
|
'inherits privileges': True,
|
|
|
|
|
'replication': False,
|
|
|
|
|
'superuser': False,
|
|
|
|
|
}),
|
|
|
|
|
'postgres.group_update': MagicMock()}):
|
|
|
|
|
with patch.dict(postgres_group.__opts__, {'test': True}):
|
|
|
|
|
ret = postgres_group.present('foo', login=True, replication=False)
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'Group foo is set to be updated',
|
|
|
|
|
'changes': {'foo': {'login': True}}, 'name': 'foo', 'result': None}
|
|
|
|
|
)
|
|
|
|
|
self.assertEqual(self.salt_stub['postgres.group_update'].call_count, 0)
|
|
|
|
|
|
|
|
|
|
# test=False
|
2014-05-28 13:11:24 +00:00
|
|
|
ret = postgres_group.present('foo', login=True, replication=False)
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
2017-04-10 13:00:57 +00:00
|
|
|
{'comment': 'The group foo has been updated',
|
|
|
|
|
'changes': {'foo': {'login': True}}, 'name': 'foo', 'result': True}
|
2014-05-28 13:11:24 +00:00
|
|
|
)
|
2017-04-10 13:00:57 +00:00
|
|
|
self.salt_stub['postgres.group_update'].assert_called_once_with(superuser=None,
|
|
|
|
|
replication=False,
|
|
|
|
|
encrypted=True,
|
|
|
|
|
runas=None,
|
|
|
|
|
inherit=None,
|
|
|
|
|
rolepassword=None,
|
|
|
|
|
port=None,
|
|
|
|
|
groupname='foo',
|
|
|
|
|
host=None,
|
|
|
|
|
createroles=None,
|
|
|
|
|
user=None,
|
|
|
|
|
groups=None,
|
|
|
|
|
maintenance_db=None,
|
|
|
|
|
login=True,
|
|
|
|
|
password=None,
|
|
|
|
|
createdb=None)
|
|
|
|
|
|
2014-05-28 13:11:24 +00:00
|
|
|
def test_present__no_update(self):
|
|
|
|
|
# test=True
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_group.__salt__, {'postgres.role_get': Mock(return_value={
|
|
|
|
|
'can create databases': False,
|
|
|
|
|
'can create roles': False,
|
|
|
|
|
'can login': False,
|
|
|
|
|
'can update system catalogs': False,
|
|
|
|
|
'connections': None,
|
|
|
|
|
'defaults variables': {},
|
|
|
|
|
'expiry time': None,
|
|
|
|
|
'inherits privileges': True,
|
|
|
|
|
'replication': False,
|
|
|
|
|
'superuser': False,
|
|
|
|
|
}),
|
|
|
|
|
'postgres.group_update': MagicMock()}):
|
|
|
|
|
with patch.dict(postgres_group.__opts__, {'test': True}):
|
|
|
|
|
ret = postgres_group.present('foo', login=False, replication=False)
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'Group foo is already present',
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': True}
|
|
|
|
|
)
|
|
|
|
|
self.assertEqual(self.salt_stub['postgres.group_update'].call_count, 0)
|
|
|
|
|
|
|
|
|
|
# test=False
|
2014-05-28 13:11:24 +00:00
|
|
|
ret = postgres_group.present('foo', login=False, replication=False)
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'Group foo is already present',
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': True}
|
|
|
|
|
)
|
2017-04-10 13:00:57 +00:00
|
|
|
self.assertEqual(self.salt_stub['postgres.group_update'].call_count, 0)
|
2014-05-28 12:56:57 +00:00
|
|
|
|
|
|
|
|
|
2014-01-19 00:07:13 +00:00
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
2017-04-10 13:00:57 +00:00
|
|
|
class PostgresExtensionTestCase(TestCase, LoaderModuleMockMixin):
|
|
|
|
|
|
|
|
|
|
def setup_loader_modules(self):
|
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
|
|
|
patcher = patch('salt.utils.path.which', Mock(return_value='/usr/bin/pgsql'))
|
2017-04-10 13:00:57 +00:00
|
|
|
patcher.start()
|
|
|
|
|
self.addCleanup(patcher.stop)
|
|
|
|
|
self.salt_stub = {
|
|
|
|
|
'config.option': Mock(),
|
|
|
|
|
'cmd.run_all': Mock(),
|
|
|
|
|
'file.chown': Mock(),
|
|
|
|
|
'file.remove': Mock(),
|
|
|
|
|
}
|
|
|
|
|
self.addCleanup(delattr, self, 'salt_stub')
|
|
|
|
|
return {
|
|
|
|
|
postgres_database: {},
|
|
|
|
|
postgres_user: {},
|
|
|
|
|
postgres_group: {},
|
|
|
|
|
postgres_schema: {},
|
|
|
|
|
postgres_extension: {
|
|
|
|
|
'__grains__': {'os_family': 'Linux'},
|
|
|
|
|
'__salt__': self.salt_stub,
|
|
|
|
|
'__opts__': {'test': False},
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-01-19 00:07:13 +00:00
|
|
|
def test_present_failed(self):
|
|
|
|
|
'''
|
|
|
|
|
scenario of creating upgrading extensions with possible schema and
|
|
|
|
|
version specifications
|
|
|
|
|
'''
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_extension.__salt__, {
|
|
|
|
|
'postgres.create_metadata': Mock(side_effect=[
|
|
|
|
|
[postgresmod._EXTENSION_NOT_INSTALLED],
|
|
|
|
|
[postgresmod._EXTENSION_TO_MOVE, postgresmod._EXTENSION_INSTALLED],
|
|
|
|
|
|
|
|
|
|
]),
|
|
|
|
|
'postgres.create_extension': Mock(side_effect=[
|
|
|
|
|
False, False,
|
|
|
|
|
])}):
|
|
|
|
|
ret = postgres_extension.present('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'Failed to install extension foo',
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': False},
|
|
|
|
|
)
|
|
|
|
|
ret = postgres_extension.present('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'Failed to upgrade extension foo',
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': False}
|
|
|
|
|
)
|
|
|
|
|
|
2014-01-19 00:07:13 +00:00
|
|
|
def test_present(self):
|
|
|
|
|
'''
|
|
|
|
|
scenario of creating upgrading extensions with possible schema and
|
|
|
|
|
version specifications
|
|
|
|
|
'''
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_extension.__salt__, {
|
|
|
|
|
'postgres.create_metadata': Mock(side_effect=[
|
|
|
|
|
[postgresmod._EXTENSION_NOT_INSTALLED],
|
|
|
|
|
[postgresmod._EXTENSION_INSTALLED],
|
|
|
|
|
[postgresmod._EXTENSION_TO_MOVE, postgresmod._EXTENSION_INSTALLED],
|
|
|
|
|
|
|
|
|
|
]),
|
|
|
|
|
'postgres.create_extension': Mock(side_effect=[
|
|
|
|
|
True, True, True,
|
|
|
|
|
])}):
|
2015-07-01 18:01:42 +00:00
|
|
|
ret = postgres_extension.present('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
2017-04-10 13:00:57 +00:00
|
|
|
{'comment': 'The extension foo has been installed',
|
|
|
|
|
'changes': {'foo': 'Installed'}, 'name': 'foo', 'result': True}
|
2015-07-01 18:01:42 +00:00
|
|
|
)
|
|
|
|
|
ret = postgres_extension.present('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
2017-04-10 13:00:57 +00:00
|
|
|
{'comment': 'Extension foo is already present',
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': True}
|
2015-07-01 18:01:42 +00:00
|
|
|
)
|
|
|
|
|
ret = postgres_extension.present('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
2017-04-10 13:00:57 +00:00
|
|
|
{'comment': 'The extension foo has been upgraded',
|
|
|
|
|
'changes': {'foo': 'Upgraded'}, 'name': 'foo', 'result': True}
|
2015-07-01 18:01:42 +00:00
|
|
|
)
|
2014-01-19 00:07:13 +00:00
|
|
|
|
2017-04-10 13:00:57 +00:00
|
|
|
def test_presenttest(self):
|
|
|
|
|
'''
|
|
|
|
|
scenario of creating upgrading extensions with possible schema and
|
|
|
|
|
version specifications
|
|
|
|
|
'''
|
|
|
|
|
with patch.dict(postgres_extension.__salt__, {
|
|
|
|
|
'postgres.create_metadata': Mock(side_effect=[
|
|
|
|
|
[postgresmod._EXTENSION_NOT_INSTALLED],
|
|
|
|
|
[postgresmod._EXTENSION_INSTALLED],
|
|
|
|
|
[postgresmod._EXTENSION_TO_MOVE, postgresmod._EXTENSION_INSTALLED],
|
|
|
|
|
|
|
|
|
|
]),
|
|
|
|
|
'postgres.create_extension': Mock(side_effect=[
|
|
|
|
|
True, True, True,
|
|
|
|
|
])}):
|
|
|
|
|
with patch.dict(postgres_extension.__opts__, {'test': True}):
|
|
|
|
|
ret = postgres_extension.present('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'Extension foo is set to be installed',
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': None}
|
|
|
|
|
|
|
|
|
|
)
|
|
|
|
|
ret = postgres_extension.present('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
2017-10-21 04:10:02 +00:00
|
|
|
{'comment': "Extension foo is already present",
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': True}
|
2017-04-10 13:00:57 +00:00
|
|
|
|
|
|
|
|
)
|
|
|
|
|
ret = postgres_extension.present('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': "Extension foo is set to be upgraded",
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': None}
|
|
|
|
|
)
|
|
|
|
|
|
2014-01-19 00:07:13 +00:00
|
|
|
def test_absent(self):
|
|
|
|
|
'''
|
|
|
|
|
scenario of creating upgrading extensions with possible schema and
|
|
|
|
|
version specifications
|
|
|
|
|
'''
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_extension.__salt__, {
|
|
|
|
|
'postgres.is_installed_extension': Mock(side_effect=[
|
|
|
|
|
True, False,
|
|
|
|
|
]),
|
|
|
|
|
'postgres.drop_extension': Mock(side_effect=[
|
|
|
|
|
True, True,
|
|
|
|
|
])}):
|
|
|
|
|
ret = postgres_extension.absent('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'Extension foo has been removed',
|
|
|
|
|
'changes': {'foo': 'Absent'}, 'name': 'foo', 'result': True}
|
|
|
|
|
)
|
|
|
|
|
ret = postgres_extension.absent('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': (
|
|
|
|
|
'Extension foo is not present, '
|
|
|
|
|
'so it cannot be removed'),
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': True}
|
|
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
2014-01-19 00:07:13 +00:00
|
|
|
def test_absent_failed(self):
|
|
|
|
|
'''
|
|
|
|
|
scenario of creating upgrading extensions with possible schema and
|
|
|
|
|
version specifications
|
|
|
|
|
'''
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_extension.__opts__, {'test': False}):
|
|
|
|
|
with patch.dict(postgres_extension.__salt__, {
|
|
|
|
|
'postgres.is_installed_extension': Mock(side_effect=[
|
|
|
|
|
True, True,
|
|
|
|
|
]),
|
|
|
|
|
'postgres.drop_extension': Mock(side_effect=[
|
|
|
|
|
False, False,
|
|
|
|
|
])}):
|
|
|
|
|
ret = postgres_extension.absent('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'Extension foo failed to be removed',
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': False}
|
|
|
|
|
)
|
|
|
|
|
|
2014-01-19 00:07:13 +00:00
|
|
|
def test_absent_failedtest(self):
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_extension.__salt__, {
|
|
|
|
|
'postgres.is_installed_extension': Mock(side_effect=[
|
|
|
|
|
True, True,
|
|
|
|
|
]),
|
|
|
|
|
'postgres.drop_extension': Mock(side_effect=[
|
|
|
|
|
False, False,
|
|
|
|
|
])}):
|
|
|
|
|
with patch.dict(postgres_extension.__opts__, {'test': True}):
|
|
|
|
|
ret = postgres_extension.absent('foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'Extension foo is set to be removed',
|
|
|
|
|
'changes': {}, 'name': 'foo', 'result': None}
|
|
|
|
|
)
|
2014-01-19 00:07:13 +00:00
|
|
|
|
|
|
|
|
|
2014-09-11 10:17:18 +00:00
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
2017-04-10 13:00:57 +00:00
|
|
|
class PostgresSchemaTestCase(TestCase, LoaderModuleMockMixin):
|
|
|
|
|
|
|
|
|
|
def setup_loader_modules(self):
|
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
|
|
|
patcher = patch('salt.utils.path.which', Mock(return_value='/usr/bin/pgsql'))
|
2017-04-10 13:00:57 +00:00
|
|
|
patcher.start()
|
|
|
|
|
self.addCleanup(patcher.stop)
|
|
|
|
|
self.salt_stub = {
|
|
|
|
|
'config.option': Mock(),
|
|
|
|
|
'cmd.run_all': Mock(),
|
|
|
|
|
'file.chown': Mock(),
|
|
|
|
|
'file.remove': Mock(),
|
|
|
|
|
}
|
|
|
|
|
self.addCleanup(delattr, self, 'salt_stub')
|
|
|
|
|
return {
|
|
|
|
|
postgres_database: {},
|
|
|
|
|
postgres_user: {},
|
|
|
|
|
postgres_extension: {},
|
|
|
|
|
postgres_group: {},
|
|
|
|
|
postgres_schema: {
|
|
|
|
|
'__grains__': {'os_family': 'Linux'},
|
|
|
|
|
'__salt__': self.salt_stub,
|
|
|
|
|
'__opts__': {'test': False},
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-11 10:17:18 +00:00
|
|
|
def test_present_creation(self):
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_schema.__salt__, {'postgres.schema_get': Mock(return_value=None),
|
|
|
|
|
'postgres.schema_create': MagicMock()}):
|
|
|
|
|
ret = postgres_schema.present('dbname', 'foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'Schema foo has been created in database dbname',
|
|
|
|
|
'changes': {'foo': 'Present'},
|
|
|
|
|
'dbname': 'dbname',
|
|
|
|
|
'name': 'foo',
|
|
|
|
|
'result': True}
|
|
|
|
|
)
|
|
|
|
|
self.assertEqual(self.salt_stub['postgres.schema_create'].call_count, 1)
|
|
|
|
|
|
2014-09-11 10:17:18 +00:00
|
|
|
def test_present_nocreation(self):
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_schema.__salt__, {
|
|
|
|
|
'postgres.schema_get': Mock(return_value={'foo':
|
|
|
|
|
{'acl': '',
|
|
|
|
|
'owner': 'postgres'}
|
|
|
|
|
}),
|
|
|
|
|
'postgres.schema_create': MagicMock()}):
|
|
|
|
|
ret = postgres_schema.present('dbname', 'foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'Schema foo already exists in database dbname',
|
|
|
|
|
'changes': {},
|
|
|
|
|
'dbname': 'dbname',
|
|
|
|
|
'name': 'foo',
|
|
|
|
|
'result': True}
|
|
|
|
|
)
|
|
|
|
|
self.assertEqual(self.salt_stub['postgres.schema_create'].call_count, 0)
|
2014-09-11 10:17:18 +00:00
|
|
|
|
|
|
|
|
def test_absent_remove(self):
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_schema.__salt__, {'postgres.schema_exists': Mock(return_value=True),
|
|
|
|
|
'postgres.schema_remove': MagicMock()}):
|
|
|
|
|
ret = postgres_schema.absent('dbname', 'foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'Schema foo has been removed from database dbname',
|
|
|
|
|
'changes': {'foo': 'Absent'},
|
|
|
|
|
'dbname': 'dbname',
|
|
|
|
|
'name': 'foo',
|
|
|
|
|
'result': True}
|
|
|
|
|
)
|
|
|
|
|
self.assertEqual(self.salt_stub['postgres.schema_remove'].call_count, 1)
|
2014-09-11 10:17:18 +00:00
|
|
|
|
|
|
|
|
def test_absent_noremove(self):
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(postgres_schema.__salt__, {'postgres.schema_exists': Mock(return_value=False),
|
|
|
|
|
'postgres.schema_remove': MagicMock()}):
|
|
|
|
|
ret = postgres_schema.absent('dbname', 'foo')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
ret,
|
|
|
|
|
{'comment': 'Schema foo is not present in database dbname,'
|
|
|
|
|
' so it cannot be removed',
|
|
|
|
|
'changes': {},
|
|
|
|
|
'dbname': 'dbname',
|
|
|
|
|
'name': 'foo',
|
|
|
|
|
'result': True}
|
|
|
|
|
)
|
|
|
|
|
self.assertEqual(self.salt_stub['postgres.schema_remove'].call_count, 0)
|
