Nicole Thomas
453401a9a0
Merge pull request #45621 from terminalmage/py3-fix-salt.utils.json
...
salt.utils.json: only encode data on PY2
2018-01-23 07:42:49 -05:00
Erik Johnson
ba54ff44a6
add tests for json load/dump helpers
2018-01-22 20:16:59 -06:00
Nicole Thomas
98e2d66809
Merge pull request #45567 from twangboy/win_fix_test_process
...
Fix `unit.utils.test_process` on Windows
2018-01-22 14:50:05 -05:00
Nicole Thomas
d066e75473
Merge pull request #45568 from twangboy/win_fix_test_schema
...
Fix `unit.utils.test_schema` for Windows/Py2
2018-01-22 14:46:23 -05:00
Nicole Thomas
af033f1c93
Merge pull request #45549 from rallytime/unicode-i
...
Add unicode_literals to modules, states, tests (I)
2018-01-22 14:40:11 -05:00
Nicole Thomas
e9c7faa357
Merge pull request #45466 from rallytime/unicode-e
...
Add unicode_literals to modules, states, tests (E)
2018-01-22 08:57:30 -05:00
Nicole Thomas
4260d55a62
Merge pull request #45595 from terminalmage/fix-boto-tests
...
Fix failing boto/network tests
2018-01-22 07:30:15 -05:00
Nicole Thomas
fc0af9b2cf
Merge pull request #45491 from terminalmage/py3-encode-decode
...
Improve PY3 compatibility of salt.utils.data.decode and encode
2018-01-21 19:10:56 -05:00
Erik Johnson
033f34ee21
Fix failing boto/network tests
...
These failures were recently introduced but went undiscovered due to
some recent instability in the test suite (which has now been fixed).
This commit fixes these failing tests.
2018-01-21 17:24:11 -06:00
Nicole Thomas
37f60b1a4b
Merge branch 'oxygen' into unicode-e
2018-01-21 17:56:39 -05:00
Nicole Thomas
be36ee8749
Merge branch 'oxygen' into win_fix_test_process
2018-01-21 17:54:55 -05:00
Nicole Thomas
1a25ceca65
Merge pull request #45531 from terminalmage/py3-pkg
...
[PY3] Add unicode_literals to pkg/pkgrepo states/modules
2018-01-21 17:52:41 -05:00
Nicole Thomas
ccefc34a79
Merge pull request #45361 from terminalmage/py3-fileserver
...
[PY3] Update fileserver for Unicode/PY3 compatibility
2018-01-21 17:51:13 -05:00
rallytime
9effd08bb3
Add unicode_literals to modules, states, tests (I)
2018-01-21 09:27:14 -05:00
rallytime
4b47e8e75a
Add unicode_literals to modules, states, tests (E)
2018-01-21 09:25:58 -05:00
Erik Johnson
2926834423
Improve robustness of daemons unit tests
...
https://github.com/saltstack/salt/pull/45583 was opened to fix some test
failures in the daemons tests. However, with the way that the tests were
written, `_multiproc_exec_test` was waiting for a response from the
child function, which would never come due to the error raised during
the test. This means that any exception raised during the test would
stop the test suite dead in its tracks, causing it to eventually end in
a timeout.
This commit addresses this design flaw by wrapping the test logic in a
try/except, and ensuring that we always return a response from the child
function. The tests will instead log the exception and gracefully fail
the test, allowing whomever troubleshoots the failures to consult the
salt-runtests.log to see the traceback.
2018-01-20 22:49:02 -06:00
Erik Johnson
c27bb7c116
[PY3] Update fileserver for Unicode/PY3 compatibility
...
This adds a unicode_literals import to the fileserver code, and also ensures
that we return unicode paths from the serialized file/env list caches
(which when deserialized are still encoded str types on PY2).
It also adds a test and modifies a few other existing tests to confirm
that unicode paths/envs are returned *as unicode* in the return data.
2018-01-20 22:25:23 -06:00
Erik Johnson
441e9dabd1
Improve PY3 compatibility of salt.utils.data.decode and encode
...
This adds the ability to specify the encoding and error behavior. It
also adds the "errors" argument to the salt.utils.stringutils funcs for
converting between str, unicode, and bytes.
Tests have also been updated to properly test the recursive behavior of
salt.utils.data.decode/encode.
2018-01-20 22:22:34 -06:00
Erik Johnson
9df3dab883
[PY3] Add unicode_literals to pkg/pkgrepo states/modules
2018-01-20 22:21:41 -06:00
Erik Johnson
83acd43294
Fix mocked logger in daemons tests
...
This was not caught when the daemons had their logging switched to using
string formatting instead of str.format()
2018-01-20 22:09:54 -06:00
twangboy
5f59c1573e
Fix issue caused by unicode literals
2018-01-19 22:58:06 +00:00
twangboy
8f2332f45c
Mock sys.platform so the test runs on Windows
2018-01-19 22:15:13 +00:00
Nicole Thomas
4fdb5cb135
Merge pull request #45419 from garethgreenaway/oxygen_updating_utils_for_unicode_round_three
...
[oxygen] Oxygen updating utils and related tests for Unicode round three
2018-01-19 16:23:56 -05:00
Nicole Thomas
061c7e3bcb
Merge pull request #45536 from twangboy/win_fix_test_configparser
...
Fix `unit.utils.test_configparser` for Windows
2018-01-19 15:14:58 -05:00
Nicole Thomas
4cfc66ad57
Merge branch 'oxygen' into oxygen_updating_utils_for_unicode_round_three
2018-01-19 10:21:37 -05:00
Nicole Thomas
bef1e070aa
Merge pull request #45338 from twangboy/win_fix_test_ansiblegate
...
Fix `unit.modules.test_ansiblegate` for Windows
2018-01-19 09:21:38 -05:00
twangboy
93aec6fbd9
Fix decode issue on Py2, Use os.linesep
2018-01-18 20:45:40 +00:00
twangboy
50859057ed
Skip tests on Windows, gate module on Windows
2018-01-18 13:27:56 -07:00
twangboy
176d3aab62
Revert one more indent
2018-01-18 13:27:56 -07:00
twangboy
38c2ce2fa0
Revert indents
2018-01-18 13:27:55 -07:00
twangboy
f72e7c28f2
Revert imports
2018-01-18 13:27:55 -07:00
twangboy
fbb4e712e7
revert changes to unittest
2018-01-18 13:27:55 -07:00
twangboy
3126af7661
Fix patch indenting, remove :returns:
2018-01-18 13:27:55 -07:00
twangboy
18bc68939c
Fix broken tests, use correct assert functions
2018-01-18 13:27:54 -07:00
twangboy
2dea2f16a9
Remove salt.utils.platform import
2018-01-18 19:13:33 +00:00
twangboy
2859be5d57
Fix mock, fix paths
2018-01-18 19:07:50 +00:00
Nicole Thomas
33e81c7cbf
Merge pull request #45515 from twangboy/win_fix_test_jinja
...
Fix `unit.templates.test_jinja` for Windows
2018-01-18 11:01:49 -05:00
Nicole Thomas
8123025a3b
Merge pull request #45512 from terminalmage/py3-b
...
[PY3] Update modules/states for PY3/Unicode compatibility (B)
2018-01-18 10:53:58 -05:00
Nicole Thomas
bd891ee13a
Merge pull request #45405 from garethgreenaway/oxygen_updating_utils_for_unicode_round_one
...
[oxygen] Updating various utils and related tests for Unicode goodness.
2018-01-18 10:39:55 -05:00
Erik Johnson
e0890baa31
Use correct attribute in test_log_created
2018-01-17 19:54:47 -06:00
Erik Johnson
2ab1e71ef2
[PY3] Add unicode_literals to salt.utils modules (P)
2018-01-17 19:54:44 -06:00
twangboy
4517ca72b9
Ensure utf-8 encoding
2018-01-17 16:22:44 -07:00
Erik Johnson
4ca7931655
[PY3] Update modules/states for PY3/Unicode compatibility (B)
...
This includes all the boto modules
2018-01-17 17:06:07 -06:00
Gareth J. Greenaway
f724c579d2
Merge branch 'oxygen' into oxygen_updating_utils_for_unicode_round_one
2018-01-17 12:51:38 -08:00
Gareth J. Greenaway
a68ff09084
Merge branch 'oxygen' into oxygen_updating_utils_for_unicode_round_three
2018-01-17 12:51:34 -08:00
Nicole Thomas
12a899cfb9
Merge pull request #45463 from rallytime/fix-unit-file-test
...
Change "to_str" to "to_bytes": needed when opening a file in bytes mode
2018-01-17 12:38:11 -05:00
Gareth J. Greenaway
a773ff90e5
More unicode changes. Adding print_function to all files. Updating various reads & writes to files.
2018-01-17 09:03:14 -08:00
Gareth J. Greenaway
a79112cc91
Updating more utils and tests for Unicode goodness
2018-01-17 09:03:14 -08:00
Gareth J. Greenaway
e14b655c01
More unicode changes. Adding print_function to all files. Updating various reads & writes to files.
2018-01-17 09:02:17 -08:00
Gareth J. Greenaway
db41d9b303
Updating various utils and related tests for unicode goodness.
2018-01-17 09:02:17 -08:00
