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.
110 lines
3.4 KiB
Python
110 lines
3.4 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
Integration tests for the zookeeper states
|
|
'''
|
|
|
|
# Import Python Libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import Salt Testing Libs
|
|
from tests.support.unit import skipIf
|
|
from tests.support.case import ModuleCase
|
|
from tests.support.helpers import destructiveTest
|
|
from tests.support.mixins import SaltReturnAssertsMixin
|
|
|
|
# Import Salt Libs
|
|
import salt.utils.path
|
|
|
|
try:
|
|
import kazoo # pylint: disable=import-error,unused-import
|
|
HAS_KAZOO = True
|
|
except ImportError:
|
|
HAS_KAZOO = False
|
|
|
|
|
|
@destructiveTest
|
|
@skipIf(not salt.utils.path.which('dockerd'), 'Docker not installed')
|
|
@skipIf(not HAS_KAZOO, 'kazoo python library not installed')
|
|
class ZookeeperTestCase(ModuleCase, SaltReturnAssertsMixin):
|
|
'''
|
|
Test zookeeper states
|
|
'''
|
|
def setUp(self):
|
|
'''
|
|
'''
|
|
self.run_state('docker_image.present', name='zookeeper')
|
|
self.run_state('docker_container.running', name='zookeeper', image='zookeeper', port_bindings='2181:2181')
|
|
|
|
def tearDown(self):
|
|
self.run_state('docker_container.stopped', name='zookeeper')
|
|
self.run_state('docker_container.absent', name='zookeeper')
|
|
self.run_state('docker_image.absent', name='docker.io/zookeeper', force=True)
|
|
|
|
def test_zookeeper_present(self):
|
|
ret = self.run_state(
|
|
'zookeeper.present',
|
|
name='/test/name',
|
|
value='testuser',
|
|
makepath=True,
|
|
)
|
|
self.assertSaltTrueReturn(ret)
|
|
|
|
ret = self.run_state(
|
|
'zookeeper.present',
|
|
name='/test/name',
|
|
value='daniel',
|
|
acls=[
|
|
{'username': 'daniel', 'password': 'test', 'read': True, 'admin': True, 'write': True, },
|
|
{'username': 'testuser', 'password': 'test', 'read': True},
|
|
],
|
|
profile='prod',
|
|
)
|
|
self.assertSaltTrueReturn(ret)
|
|
|
|
def test_zookeeper_absent(self):
|
|
self.run_state(
|
|
'zookeeper.present',
|
|
name='/test/name',
|
|
value='testuser',
|
|
makepath=True,
|
|
)
|
|
ret = self.run_state(
|
|
'zookeeper.absent',
|
|
name='/test/name',
|
|
)
|
|
self.assertSaltTrueReturn(ret)
|
|
self.assertTrue(bool(ret['zookeeper_|-/test/name_|-/test/name_|-absent']['changes']))
|
|
ret = self.run_state(
|
|
'zookeeper.absent',
|
|
name='/test/name',
|
|
)
|
|
self.assertFalse(bool(ret['zookeeper_|-/test/name_|-/test/name_|-absent']['changes']))
|
|
|
|
def test_zookeeper_acls(self):
|
|
ret = self.run_state(
|
|
'zookeeper.acls',
|
|
name='/test/name',
|
|
acls=[
|
|
{'username': 'daniel', 'password': 'test', 'read': True, 'admin': True, 'write': True, },
|
|
{'username': 'testuser', 'password': 'test', 'read': True},
|
|
]
|
|
)
|
|
self.assertSaltFalseReturn(ret)
|
|
|
|
ret = self.run_state(
|
|
'zookeeper.present',
|
|
name='/test/name',
|
|
value='testuser',
|
|
makepath=True,
|
|
)
|
|
|
|
ret = self.run_state(
|
|
'zookeeper.acls',
|
|
name='/test/name',
|
|
acls=[
|
|
{'username': 'daniel', 'password': 'test', 'read': True, 'admin': True, 'write': True, },
|
|
{'username': 'testuser', 'password': 'test', 'read': True},
|
|
]
|
|
)
|
|
self.assertSaltTrueReturn(ret)
|