20 Commits

Author	SHA1	Message	Date
Erik Johnson	3184168365	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-08-08 13:33:43 -05:00
rallytime	ccf790a83f	Update all references for moved functions to use "files" util ... - fopen - flopen - fpopen - safe_rm - is_empty - is_fcntl_available	2017-07-18 10:31:01 -06:00
Gareth J. Greenaway	17ddc9396c	Fixing the last text failure.	2017-06-08 20:03:05 -07:00
Gareth J. Greenaway	ace175edae	Couple more typos, assert not asset.	2017-06-08 15:30:44 -07:00
Gareth J. Greenaway	e39d05060e	Fixing typo in assertSaltTrueReturn, assertSaltFalseReturn and assertSaltNoneReturn.	2017-06-08 14:18:05 -07:00
Gareth J. Greenaway	207dc61405	Updating the assert tests for develop based on changes from 41569.	2017-06-08 14:18:04 -07:00
Pedro Algarvio	88627d312f	Write the generated configuration into a config file	2017-04-28 13:33:36 +01:00
Pedro Algarvio	eb588c772a	Add missing futures import	2017-04-05 23:16:52 +01:00
Pedro Algarvio	104a2fb30c	Keep the same exception raised before the move	2017-04-04 18:04:39 +01:00
Pedro Algarvio	b94992f544	Some more RUNTIME_CONFIGS and RUNTIME_VARS fixes	2017-04-04 18:04:38 +01:00
Pedro Algarvio	8031ac0209	Move mixins to tests.support.mixins. ... The adapted config mixin get config methods are not static methods	2017-04-04 17:29:34 +01:00
Pedro Algarvio	174625618a	Add mixin to assert XML equality	2017-04-01 14:22:58 +01:00
Pedro Algarvio	9a11538b54	Stop using deprecated TestCase methods	2017-04-01 14:22:57 +01:00
Pedro Algarvio	090041d674	Allow patching sys.modules with mocked modules	2017-03-28 19:04:04 +01:00
Pedro Algarvio	7c9460b719	Reduce complexity while still allowing multiple loader modules to be mocked ... This also goes in par with the effort to reduce memory usage since we no longer have any class attributes attached to the test classes.	2017-03-28 19:02:51 +01:00
Pedro Algarvio	e7768705f9	Allow passing different loader_module_globals per loader_module	2017-03-28 19:02:51 +01:00
Pedro Algarvio	30f62f22ec	Simplify the mock mixin required work ... This approach does not require the user to call `super().setUp()`	2017-03-28 19:00:51 +01:00
Pedro Algarvio	0cb46f0eb8	Several enhancements to the mocked loader module mixin ... Allows patching more than one loader module. Allows auto-loading the minion functions which will get namespaced with the globals used to patch the loader module(s).	2017-03-09 19:31:15 +00:00
Pedro Algarvio	3beb3fb801	Move whatever we need from salttesting to salt. ... Let's drop the salttesting dependency cycle.	2017-02-28 22:52:49 +00:00
Pedro Algarvio	1daa2e24cd	Moved some test supporting modules to tests/support ... Previously they were in tests/utils which also had test case modules.	2017-02-28 22:52:48 +00:00