Dmitry Kuzmenko
3ee328a28c
Salt Unicode Update
2018-01-22 14:38:24 +03:00
Gareth J. Greenaway
af7a29f75a
Merge pull request #45596 from terminalmage/duplicate-import
...
Remove duplicate import
2018-01-21 17:52:10 -08:00
Erik Johnson
e21f3a5a46
Remove duplicate import
2018-01-21 19:48:12 -06: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
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
Nicole Thomas
a5128e8184
Merge pull request #45584 from terminalmage/daemons-test-stability
...
Improve robustness of daemons unit tests
2018-01-21 13:08:06 -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
07d37ed944
Add unicode_literals to salt.utils.url to fix str/unicode mismatch in fileclient
2018-01-20 22:25:23 -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
Mike Place
ab63da4f35
Merge pull request #45583 from terminalmage/fix-mocked-logger
...
Fix mocked logger in daemons tests
2018-01-20 21:14:56 -07: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
Erik Johnson
0caa9091ca
Merge pull request #45575 from terminalmage/fix-log-message
...
Fix arg order in log message
2018-01-20 17:17:57 -06:00
Mike Place
2295d4df39
Merge pull request #45579 from terminalmage/test-suite-stability
...
Test suite stability fixes
2018-01-20 16:15:47 -07:00
Erik Johnson
34db948300
Restrict pyzmq optimizations to pyzmq >= 14.3.0
...
The optimizations added in 00f31bf
2018-01-20 16:44:46 -06:00
Erik Johnson
62117d0021
Fix event unpack
2018-01-20 14:24:22 -06:00
Erik Johnson
dd8599309b
Fix arg order in log message
...
When str.format() was removed from this log message in 685bfbb
2018-01-20 13:23:57 -06:00
Nicole Thomas
b33df7dadd
Merge pull request #45480 from terminalmage/str-environ
...
aptpkg: force additional environment variables to be str types
2018-01-20 10:31:22 -05: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
Erik Johnson
4176f4cbd9
aptpkg: force additional environment variables to be str types
...
This prevents tracebacks in subprocess due to unicode values in
the dict merged into os.environ via the module's __init__ func.
2018-01-19 15:23:16 -06: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
Nicole Thomas
31111ef734
Merge pull request #45534 from twangboy/win_fix_test_crypt
...
Fix `unit.test_crypt` for Windows
2018-01-18 17:53:09 -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
01145c6afd
Merge pull request #45488 from terminalmage/str-env
...
[PY2] timed_subprocess: ensure custom env vars do not contain unicode
2018-01-18 10:43:44 -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
Nicole Thomas
83e9893b5d
Merge pull request #45426 from terminalmage/py3-salt.utils-p
...
[PY3] Add unicode_literals to salt.utils modules (P)
2018-01-18 10:31:08 -05:00
Nicole Thomas
3dc3e4e690
Merge pull request #45412 from isbm/isbm-ssdp-spurious-errors-fix
...
Isbm ssdp spurious errors fix
2018-01-18 07:07:01 -05:00
Erik Johnson
7199c0b9db
(PY2 only) Ensure custom args passed to timed_subprocess are encoded
2018-01-17 20:43:48 -06:00
Erik Johnson
abd470f7b1
Handle corner case where None is passed in command args
2018-01-17 20:43:48 -06:00
Erik Johnson
ef44ca977a
[PY2] timed_subprocess: ensure custom env vars do not contain unicode
...
subprocess will use `ascii` to encode them which will cause trouble if
any actual unicode content is present.
2018-01-17 20:43:48 -06: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
