Erik Johnson
fa37509d1f
Fix several shadow tests for PY3
...
The recent unicode_literals changes broke PY3 when generating a password
using random bytes from pycryto/Cryptodome, this catches the failure to
decode and skips until we get a decodable byte.
2018-01-26 11:19:15 -06:00
Nicole Thomas
3a413e96c5
Merge pull request #45718 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2017.7.3 to 2017.7
2018-01-26 11:49:43 -05:00
Erik Johnson
79aa909d7a
Docstring tweak
2018-01-26 09:57:06 -06:00
Erik Johnson
8e3220f43a
Fix unit.templates.test_jinja.TestCustomExtensions.test_uuid for PY3
2018-01-26 09:57:06 -06:00
Erik Johnson
78a7d654fa
Fix unit.modules.test_tls.TLSAddTestCase.test_pyOpenSSL_version_destructive for PY3
...
Also fix some deprecation warnings from pyopenssl
2018-01-26 09:56:42 -06:00
Erik Johnson
b0f2a51752
Fix unit.modules.test_hosts.HostsTestCase.test_set_host_true_remove for PY3
2018-01-26 09:54:21 -06:00
rallytime
f10c7ee92d
Merge branch '2017.7.3' into '2017.7'
...
No conflicts.
2018-01-26 09:59:21 -05:00
Nicole Thomas
d0955519cf
Merge pull request #45690 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2018-01-26 09:41:44 -05:00
Bo Maryniuk
2839c089ac
Restore accidentally broken test
2018-01-26 15:31:29 +01:00
Nicole Thomas
9c92e93834
Merge pull request #45710 from michelsen/fix-chocolatey-state-bug
...
Added source argument to function call
2018-01-26 09:30:48 -05:00
Bo Maryniuk
8e7a4da5e8
Remove extra-parenthesis
2018-01-26 15:26:34 +01:00
Bo Maryniuk
042d5b075d
Remove extra backslashes
2018-01-26 15:26:24 +01:00
Bo Maryniuk
f663c6f5e5
Lintfix: line too long
2018-01-26 15:26:04 +01:00
Bo Maryniuk
6c8929147e
Lintfix: continuation
2018-01-26 15:25:49 +01:00
Bo Maryniuk
657db52302
Fix docstrings
2018-01-26 15:25:14 +01:00
Bo Maryniuk
11130f7d9d
Fix unicode strings
2018-01-26 15:24:31 +01:00
Bo Maryniuk
876f968263
Add print_function and unicode_literals
2018-01-26 15:23:44 +01:00
Nicole Thomas
ddae2d611e
Merge pull request #45696 from twangboy/win_fix_tests
...
Fix stacktrace at the end of a test
2018-01-26 09:20:55 -05:00
Bo Maryniuk
2acff9d49d
Fix docstring
2018-01-26 15:01:01 +01:00
Bo Maryniuk
5d84ce1856
Add TODO remark on possible removal of the unicode-test tests
2018-01-26 15:00:51 +01:00
Bo Maryniuk
6b71bf9204
Remove extra backslashes
2018-01-26 15:00:33 +01:00
Bo Maryniuk
791d9a8761
Fix log formatting
2018-01-26 15:00:12 +01:00
Bo Maryniuk
63cf21730c
Remove garbage code
2018-01-26 14:59:57 +01:00
Bo Maryniuk
2c2be36647
Use parenthesis for multiline imports
2018-01-26 14:59:30 +01:00
Bo Maryniuk
d1f7e4753a
Fix iterations over dict items
2018-01-26 14:59:04 +01:00
Bo Maryniuk
7362a55064
Lintfix: continuation
2018-01-26 14:58:46 +01:00
Bo Maryniuk
9778958d26
Lintfix: line too long
2018-01-26 14:58:11 +01:00
Bo Maryniuk
764534f685
Add print_function and unicode_literals
2018-01-26 14:57:36 +01:00
Nicole Thomas
4697769d0b
Merge pull request #44962 from DSRCorporation/m2crypto
...
Migrate to M2crypto
2018-01-26 08:54:04 -05:00
Nicole Thomas
73d0a10a65
Merge pull request #45581 from garethgreenaway/tier_two_unicode_modules_state_palooza
...
[oxygen] Updating Tier 2 modules, states and related tests for Unicode
2018-01-26 08:50:05 -05:00
Bo Maryniuk
a0baa21de9
Lintfix: continuation
2018-01-26 14:12:11 +01:00
Bo Maryniuk
fb7c5aa0a8
Lintfix: extra parenthesis
2018-01-26 14:11:50 +01:00
Bo Maryniuk
395edcd573
Remove extra back-slashes
2018-01-26 14:11:28 +01:00
Bo Maryniuk
9319b2b450
Lintfix: continuation
2018-01-26 14:11:01 +01:00
Bo Maryniuk
cfdb92be67
Lintfix: PEP8 - line too long
2018-01-26 14:10:43 +01:00
Bo Maryniuk
558c943602
Fix str() function
2018-01-26 14:10:20 +01:00
Bo Maryniuk
274135ae5e
Add unicode_literals and print_function
2018-01-26 14:09:58 +01:00
Bo Maryniuk
b4c5d66637
Add print_function import
2018-01-26 13:43:11 +01:00
Bo Maryniuk
b013fa8dc1
Remove unnecessary backslashes
2018-01-26 13:30:07 +01:00
Bo Maryniuk
84c08dd32b
Lintfix: fix doc ident
2018-01-26 13:30:00 +01:00
Bo Maryniuk
87f8538c4d
Add unicode_literals
2018-01-26 13:29:40 +01:00
Benjamin Drung
217183405a
Decode git call output in Python 3
...
The subprocess communicate() method returns byte streams for stdout and
stderr in Python 3. They need to be decoded to str. Otherwise the
version string parsing will fail:
Traceback (most recent call last):
File "salt/version.py", line 522, in __discover_version
return SaltStackVersion.parse(out)
File "salt/version.py", line 267, in parse
'Unable to parse version string: \'{0}\''.format(version_string)
ValueError: Unable to parse version string: 'b'c0e6782d''
2018-01-26 13:11:34 +01:00
Levi Dahl Michelsen
8accc0ce5c
Added source argument to function call
2018-01-26 12:27:33 +01:00
Bo Maryniuk
fe99de3c0c
Replace usage of str() forcing to unicode
2018-01-26 10:34:31 +01:00
Bo Maryniuk
f0c8839c1a
Lintfix C0201: remove .keys() method
2018-01-26 10:34:31 +01:00
Bo Maryniuk
6144786fa8
Lintfix: W1699 (Python3 incompatibility)
2018-01-26 10:34:31 +01:00
Bo Maryniuk
ff89cd8527
Remove unused ImportError variable
2018-01-26 10:34:31 +01:00
Bo Maryniuk
f1b55e2ad0
Remove unused import
2018-01-26 10:34:31 +01:00
Bo Maryniuk
6ad6d11d97
Add unit test for timestamp error
2018-01-26 10:34:31 +01:00
Bo Maryniuk
50d3ce711e
Add restriction check of log call when only general error happens
2018-01-26 10:34:31 +01:00
