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.
55 lines
1.5 KiB
Python
55 lines
1.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Import Pytohn libs
|
|
from __future__ import absolute_import
|
|
|
|
# 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 Module
|
|
import salt.modules.nginx as nginx
|
|
|
|
MOCK_STATUS_OUTPUT = """Active connections: 7
|
|
server accepts handled requests
|
|
46756 46756 89318
|
|
Reading: 0 Writing: 7 Waiting: 0"""
|
|
|
|
|
|
class MockUrllibStatus(object):
|
|
"""Mock of urllib2 call for Nginx status"""
|
|
def read(self):
|
|
return MOCK_STATUS_OUTPUT
|
|
|
|
def close(self):
|
|
pass
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class NginxTestCase(TestCase, LoaderModuleMockMixin):
|
|
|
|
def setup_loader_modules(self):
|
|
patcher = patch('salt.utils.path.which', Mock(return_value='/usr/bin/nginx'))
|
|
patcher.start()
|
|
self.addCleanup(patcher.stop)
|
|
return {nginx: {'_urlopen': Mock(return_value=MockUrllibStatus())}}
|
|
|
|
def test_nginx_status(self):
|
|
result = nginx.status()
|
|
nginx._urlopen.assert_called_once_with('http://127.0.0.1/status')
|
|
self.assertEqual(result, {
|
|
'active connections': 7,
|
|
'accepted': 46756,
|
|
'handled': 46756,
|
|
'requests': 89318,
|
|
'reading': 0,
|
|
'writing': 7,
|
|
'waiting': 0,
|
|
})
|
|
|
|
def test_nginx_status_with_arg(self):
|
|
other_path = 'http://localhost/path'
|
|
result = nginx.status(other_path)
|
|
nginx._urlopen.assert_called_once_with(other_path)
|