21 Commits

Author	SHA1	Message	Date
Erik Johnson	9c86cd627a	[PY3] Add unicode_literals to high-priority modules/states	2018-01-24 10:33:58 -06:00
rallytime	db5866d097	Update old utils paths to new utils paths	2017-12-11 18:43:33 -05:00
rallytime	08c71f13e4	Merge branch '2017.7' into 'oxygen' ... Conflicts: - doc/ref/configuration/minion.rst - doc/topics/thorium/index.rst - salt/beacons/__init__.py - salt/client/mixins.py - salt/client/ssh/wrapper/state.py - salt/daemons/masterapi.py - salt/grains/extra.py - salt/minion.py - salt/modules/cron.py - salt/modules/file.py - salt/modules/mac_user.py - salt/modules/napalm_network.py - salt/modules/state.py - salt/modules/win_file.py - salt/modules/win_pkg.py - salt/proxy/dummy.py - salt/state.py - salt/states/file.py - salt/states/lxc.py - salt/utils/__init__.py - salt/utils/schedule.py - tests/integration/modules/test_file.py - tests/integration/modules/test_groupadd.py - tests/integration/ssh/test_state.py - tests/integration/states/test_file.py - tests/unit/daemons/test_masterapi.py - tests/unit/grains/test_core.py - tests/unit/modules/test_disk.py - tests/unit/modules/test_napalm_network.py - tests/unit/modules/test_state.py - tests/unit/test_minion.py - tests/unit/utils/test_process.py	2017-12-11 18:24:41 -05:00
twangboy	5615862f23	Fix some lint	2017-12-01 10:25:48 -07:00
twangboy	627d5ab0c9	Mock salt.utils.which ... cmd.run return values are mocked	2017-12-01 10:25:48 -07:00
twangboy	e5a96fe00f	Skip test_fstype on Windows ... no lsblk on Windows	2017-12-01 10:25:48 -07:00
Erik Johnson	877abb89d0	Complete the salt.utils refactor ... This moves the remaining 30 functions from salt.utils to new locations.	2017-10-15 09:43:31 -05:00
Nicole Thomas	a48afa7175	Merge pull request #43763 from twangboy/win_fix_test_disk ... Fix `unit.modules.test_disk` for Windows	2017-09-27 10:32:41 -04:00
twangboy	35505ac966	Honor 80 char limit	2017-09-26 15:52:04 -06:00
twangboy	26b23b37bc	Skip test if missing binaries	2017-09-26 15:51:22 -06:00
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
Erik Johnson	d942752e95	Fix usage of assert_called_once in Python 3 < 3.6 ... This is a more complete fix which builds upon 41c65b0 and covers all refs to assert_called_once in the suite.	2017-07-03 09:30:12 -05:00
Dmitry Kuzmenko	127e48025a	Py3: tests_disk fix: don't expect dict iteration order will be the same	2017-06-21 14:48:59 +03:00
Pedro Algarvio	abe608d739	Drop @patch usage	2017-04-28 13:36:42 +01:00
rallytime	f552dd63f3	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - pkg/windows/installer/Salt-Minion-Setup.nsi - tests/unit/states/test_tomcat.py	2017-04-14 10:46:56 -06:00
Pedro Algarvio	d397763553	Adjust to the new LoaderModuleMockMixin usage	2017-03-28 19:03:59 +01:00
Pedro Algarvio	9b1e55aa85	Import the full module namespace to avoid import shadowing. ... https://github.com/saltstack/salt/pull/39996#issuecomment-287857698	2017-03-28 19:02:47 +01:00
Pedro Algarvio	1f7a0aa65b	Proper mocking	2017-03-28 19:00:51 +01:00
Pedro Algarvio	40a64191a1	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +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	15af4c9728	Test filenames conformity. Adjust for pytest.	2017-02-23 23:19:42 +00:00