mirror of
https://github.com/valitydev/salt.git
synced 2024-11-06 16:45:27 +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.
130 lines
5.4 KiB
Python
130 lines
5.4 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Copyright (c) 2011-2012, Sylvain Hellegouarch
|
|
# All rights reserved.
|
|
|
|
# Redistribution and use in source and binary forms, with or without modification,
|
|
# are permitted provided that the following conditions are met:
|
|
|
|
# * Redistributions of source code must retain the above copyright notice,
|
|
# this list of conditions and the following disclaimer.
|
|
# * Redistributions in binary form must reproduce the above copyright notice,
|
|
# this list of conditions and the following disclaimer in the documentation
|
|
# and/or other materials provided with the distribution.
|
|
# * Neither the name of Sylvain Hellegouarch nor the names of his contributors
|
|
# may be used to endorse or promote products derived from this software
|
|
# without specific prior written permission.
|
|
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
|
|
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
#
|
|
# Modified from the original. See the Git history of this file for details.
|
|
# https://bitbucket.org/Lawouach/cherrypy-recipes/src/50aff88dc4e24206518ec32e1c32af043f2729da/testing/unit/serverless/cptestcase.py
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import, print_function
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.case import TestCase
|
|
|
|
# Import 3rd-party libs
|
|
# pylint: disable=import-error
|
|
import cherrypy # pylint: disable=3rd-party-module-not-gated
|
|
from salt.ext import six
|
|
from salt.ext.six.moves import StringIO
|
|
# pylint: enable=import-error
|
|
|
|
# Not strictly speaking mandatory but just makes sense
|
|
cherrypy.config.update({'environment': "test_suite"})
|
|
|
|
# This is mandatory so that the HTTP server isn't started
|
|
# if you need to actually start (why would you?), simply
|
|
# subscribe it back.
|
|
cherrypy.server.unsubscribe()
|
|
|
|
# simulate fake socket address... they are irrelevant in our context
|
|
local = cherrypy.lib.httputil.Host('127.0.0.1', 50000, "")
|
|
remote = cherrypy.lib.httputil.Host('127.0.0.1', 50001, "")
|
|
|
|
__all__ = ['BaseCherryPyTestCase']
|
|
|
|
|
|
class BaseCherryPyTestCase(TestCase):
|
|
def request(self, path='/', method='GET', app_path='', scheme='http',
|
|
proto='HTTP/1.1', body=None, qs=None, headers=None, **kwargs):
|
|
"""
|
|
CherryPy does not have a facility for serverless unit testing.
|
|
However this recipe demonstrates a way of doing it by
|
|
calling its internal API to simulate an incoming request.
|
|
This will exercise the whole stack from there.
|
|
|
|
Remember a couple of things:
|
|
|
|
* CherryPy is multithreaded. The response you will get
|
|
from this method is a thread-data object attached to
|
|
the current thread. Unless you use many threads from
|
|
within a unit test, you can mostly forget
|
|
about the thread data aspect of the response.
|
|
|
|
* Responses are dispatched to a mounted application's
|
|
page handler, if found. This is the reason why you
|
|
must indicate which app you are targeting with
|
|
this request by specifying its mount point.
|
|
|
|
You can simulate various request settings by setting
|
|
the `headers` parameter to a dictionary of headers,
|
|
the request's `scheme` or `protocol`.
|
|
|
|
.. seealso: http://docs.cherrypy.org/stable/refman/_cprequest.html#cherrypy._cprequest.Response
|
|
"""
|
|
# This is a required header when running HTTP/1.1
|
|
h = {'Host': '127.0.0.1'}
|
|
|
|
# if we had some data passed as the request entity
|
|
# let's make sure we have the content-length set
|
|
fd = None
|
|
if body is not None:
|
|
h['content-length'] = '{0}'.format(len(body))
|
|
fd = StringIO(body)
|
|
|
|
if headers is not None:
|
|
h.update(headers)
|
|
|
|
# Get our application and run the request against it
|
|
app = cherrypy.tree.apps.get(app_path)
|
|
if not app:
|
|
# XXX: perhaps not the best exception to raise?
|
|
raise AssertionError("No application mounted at '{0}'".format(app_path))
|
|
|
|
# Cleanup any previous returned response
|
|
# between calls to this method
|
|
app.release_serving()
|
|
|
|
# Let's fake the local and remote addresses
|
|
request, response = app.get_serving(local, remote, scheme, proto)
|
|
try:
|
|
h = [(k, v) for k, v in six.iteritems(h)]
|
|
response = request.run(method, path, qs, proto, h, fd)
|
|
finally:
|
|
if fd:
|
|
fd.close()
|
|
fd = None
|
|
|
|
if response.output_status.startswith(six.b('500')):
|
|
response_body = response.collapse_body()
|
|
if six.PY3:
|
|
response_body = response_body.decode(__salt_system_encoding__)
|
|
print(response_body)
|
|
raise AssertionError("Unexpected error")
|
|
|
|
# collapse the response into a bytestring
|
|
response.collapse_body()
|
|
return request, response
|