2014-01-29 21:40:23 +00:00
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
|
2014-11-21 19:05:13 +00:00
|
|
|
# Import Python libs
|
|
|
|
|
from __future__ import absolute_import
|
|
|
|
|
|
2014-01-29 21:40:23 +00:00
|
|
|
# Import Salt Testing libs
|
2017-03-21 23:56:24 +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, MagicMock, Mock, patch
|
2014-01-29 21:40:23 +00:00
|
|
|
|
2017-02-27 15:59:04 +00:00
|
|
|
# Import salt libs
|
2017-03-21 17:15:36 +00:00
|
|
|
import salt.modules.uwsgi as uwsgi
|
2014-01-29 21:40:23 +00:00
|
|
|
|
2014-01-29 22:07:45 +00:00
|
|
|
|
2014-01-29 21:40:23 +00:00
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
2017-03-21 23:56:24 +00:00
|
|
|
class UwsgiTestCase(TestCase, LoaderModuleMockMixin):
|
|
|
|
|
|
2017-03-22 12:12:36 +00:00
|
|
|
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/uwsgi'))
|
2017-04-10 13:00:57 +00:00
|
|
|
patcher.start()
|
|
|
|
|
self.addCleanup(patcher.stop)
|
2017-03-22 12:12:36 +00:00
|
|
|
return {uwsgi: {}}
|
2014-01-29 21:40:23 +00:00
|
|
|
|
|
|
|
|
def test_uwsgi_stats(self):
|
|
|
|
|
socket = "127.0.0.1:5050"
|
|
|
|
|
mock = MagicMock(return_value='{"a": 1, "b": 2}')
|
|
|
|
|
with patch.dict(uwsgi.__salt__, {'cmd.run': mock}):
|
|
|
|
|
result = uwsgi.stats(socket)
|
2014-01-29 22:03:17 +00:00
|
|
|
mock.assert_called_once_with(
|
2015-01-07 18:50:41 +00:00
|
|
|
['uwsgi', '--connect-and-read', '{0}'.format(socket)],
|
|
|
|
|
python_shell=False)
|
2014-01-29 21:40:23 +00:00
|
|
|
self.assertEqual(result, {'a': 1, 'b': 2})
|
