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.
93 lines
2.3 KiB
Python
93 lines
2.3 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Jayesh Kariya <jayeshk@saltstack.com>`
|
|
'''
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import Salt Testing Libs
|
|
from tests.support.unit import skipIf, TestCase
|
|
from tests.support.mock import (
|
|
NO_MOCK,
|
|
NO_MOCK_REASON)
|
|
|
|
# Import Salt Libs
|
|
import salt.states.modjk as modjk
|
|
from salt.ext import six
|
|
|
|
|
|
if six.PY2:
|
|
LIST_NOT_STR = "workers should be a list not a <type 'str'>"
|
|
else:
|
|
LIST_NOT_STR = "workers should be a list not a <class 'str'>"
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class ModjkTestCase(TestCase):
|
|
'''
|
|
Test cases for salt.states.modjk
|
|
'''
|
|
# 'worker_stopped' function tests: 1
|
|
|
|
def test_worker_stopped(self):
|
|
'''
|
|
Test to stop all the workers in the modjk load balancer
|
|
'''
|
|
name = 'loadbalancer'
|
|
|
|
ret = {'name': name,
|
|
'result': False,
|
|
'comment': '',
|
|
'changes': {}}
|
|
|
|
ret.update({'comment': LIST_NOT_STR})
|
|
self.assertDictEqual(modjk.worker_stopped(name, 'app1'), ret)
|
|
|
|
# 'worker_activated' function tests: 1
|
|
|
|
def test_worker_activated(self):
|
|
'''
|
|
Test to activate all the workers in the modjk load balancer
|
|
'''
|
|
name = 'loadbalancer'
|
|
|
|
ret = {'name': name,
|
|
'result': False,
|
|
'comment': '',
|
|
'changes': {}}
|
|
|
|
ret.update({'comment': LIST_NOT_STR})
|
|
self.assertDictEqual(modjk.worker_activated(name, 'app1'), ret)
|
|
|
|
# 'worker_disabled' function tests: 1
|
|
|
|
def test_worker_disabled(self):
|
|
'''
|
|
Test to disable all the workers in the modjk load balancer
|
|
'''
|
|
name = 'loadbalancer'
|
|
|
|
ret = {'name': name,
|
|
'result': False,
|
|
'comment': '',
|
|
'changes': {}}
|
|
|
|
ret.update({'comment': LIST_NOT_STR})
|
|
self.assertDictEqual(modjk.worker_disabled(name, 'app1'), ret)
|
|
|
|
# 'worker_recover' function tests: 1
|
|
|
|
def test_worker_recover(self):
|
|
'''
|
|
Test to recover all the workers in the modjk load balancer
|
|
'''
|
|
name = 'loadbalancer'
|
|
|
|
ret = {'name': name,
|
|
'result': False,
|
|
'comment': '',
|
|
'changes': {}}
|
|
|
|
ret.update({'comment': LIST_NOT_STR})
|
|
self.assertDictEqual(modjk.worker_recover(name, 'app1'), ret)
|