Ch3LL
bd3a73dd04
Fix mac_assistive module not loading
2018-02-16 10:52:18 -05:00
Nicole Thomas
1a50abb3b4
Merge pull request #46032 from DSRCorporation/bugs/45956_sigint_traceback
...
Workaroung python bug in traceback.format_exc()
2018-02-14 11:58:57 -05:00
Nicole Thomas
3e18604d75
Merge pull request #45979 from isbm/isbm-parsers-loggerfix-unicode-rc1
...
Unicode/logger fix + bugfix: salt/utils/parsers
2018-02-14 10:39:24 -05:00
Dmitry Kuzmenko
5a3316ea20
Workaroung python bug in traceback.format_exc()
...
The function raises an AttributeError if there is no current exception.
https://bugs.python.org/issue23003
2018-02-14 16:16:57 +03:00
Nicole Thomas
e7999e260d
Merge pull request #44892 from terminalmage/yamlloader
...
Force Salt's YAML loader to load all strings as unicode types
2018-02-13 17:00:37 -05:00
Erik Johnson
9d004f6512
Use mock 2.0.0 instead of unittest.mock on Python 3 ( #2 )
...
This preserves the custom mock_open we backported from unittest.mock,
but otherwise ditches unittest.mock as it does not have
MagicMock.assert_called in Python releases before 3.6.
This allows us to maintain a uniform mock version across all platforms
and Python releases.
2018-02-13 20:16:03 +01:00
Nicole Thomas
d72cf1dd6f
Merge pull request #45997 from garethgreenaway/2557_schedule_fixes_once
...
[oxygen.rc1] scheduler once fixes
2018-02-13 11:18:06 -05:00
Nicole Thomas
280bd8d862
Merge pull request #45990 from gtmanfred/rootdir
...
fix rootdir prepending on windows
2018-02-13 08:59:44 -05:00
Nicole Thomas
175c8be882
Merge pull request #45999 from terminalmage/issue45960
...
Properly handle undecodable bytestrings in nested outputter
2018-02-13 08:43:56 -05:00
Erik Johnson
6cb1a38407
Properly handle undecodable bytestrings in nested outputter
...
Note however that these bytestrings will typically end up being
whitespace when printed. But, at least they will no longer result in a
traceback.
2018-02-12 22:35:45 -06:00
Gareth J. Greenaway
b752775c44
A couple bug fixes in the scheduler when once is used for the job run time.
2018-02-12 20:21:16 -08:00
Daniel Wallace
9e98f9dcdb
fix rootdir prepending on windows
2018-02-12 15:36:27 -07:00
Gareth J. Greenaway
d17cb93b27
Merge pull request #45989 from rallytime/bp-45984
...
Back-port #45984 to oxygen.rc1
2018-02-12 14:27:45 -08:00
Gareth J. Greenaway
a8c2cd8066
Missing format in the call to write.
2018-02-12 17:26:10 -05:00
Nicole Thomas
ff6a8d6df9
Merge pull request #45937 from twangboy/win_fix_pkg_unicode
...
Fix Py2 unicode issue in win_pkg.py
2018-02-12 15:21:14 -05:00
Bo Maryniuk
888939116a
Drop forcing to unicode exception object
2018-02-12 18:55:55 +01:00
Bo Maryniuk
8b5af58066
Fix lints
2018-02-12 18:54:23 +01:00
Bo Maryniuk
07ef909ea9
Remove unused variables, rename mixin variable to more exact name
2018-02-12 18:54:23 +01:00
Bo Maryniuk
9fa6647bd0
Refactor a unit test for calling PID file removal without the exception
2018-02-12 18:54:23 +01:00
Bo Maryniuk
fe4502b0e4
Add debug logging call to the unit test check
2018-02-12 18:54:23 +01:00
Bo Maryniuk
d9941ce1f3
Throw away unnecessary variable handling
2018-02-12 18:54:23 +01:00
Bo Maryniuk
06158e4242
Remove unnecessary string on get->return
2018-02-12 18:54:23 +01:00
Bo Maryniuk
2908422539
Add debugging information to the log
2018-02-12 18:54:23 +01:00
Bo Maryniuk
56818045b6
Add unit test for calling PID deletion as non-root user
2018-02-12 18:54:23 +01:00
Bo Maryniuk
2f5b133149
Fix unit test to attempt remove PID file as root
2018-02-12 18:54:23 +01:00
Bo Maryniuk
3a8e43f806
Add tear-down method
2018-02-12 18:54:23 +01:00
Bo Maryniuk
7a0e3e983c
Use pytest
2018-02-12 18:54:23 +01:00
Bo Maryniuk
879c40b1c3
Fix logging, remove extra-parenthesis (PEP8)
2018-02-12 18:54:23 +01:00
Bo Maryniuk
f7887e5f7c
PEP8: remove extra-parenthesis
2018-02-12 18:54:23 +01:00
Bo Maryniuk
1be8f8d820
Bugfix: do not crash on import error, but log that incident instead
2018-02-12 18:54:23 +01:00
Nicole Thomas
869036ee2e
Merge pull request #45957 from rallytime/boto-cfn-six-import
...
Add missing six import in boto_cfn module
2018-02-12 11:29:09 -05:00
Nicole Thomas
bc13ff8b48
Merge pull request #45941 from terminalmage/issue45679
...
Fix incorrect translation of docker port_bindings -> ports
2018-02-12 11:28:36 -05:00
Bo Maryniuk
5b9c49d6bb
Use logger variable and fix unicode support
2018-02-12 13:36:05 +01:00
Bo Maryniuk
e83490032d
Fix unicode support for the logging
2018-02-12 13:36:05 +01:00
Bo Maryniuk
62b5a0c3ea
Use logger variable
2018-02-12 13:36:05 +01:00
Bo Maryniuk
628df440ed
Remove extra-backslashes
2018-02-12 13:36:05 +01:00
Bo Maryniuk
0c40c4a4b6
Remove extra-parenthesis and extra-backslashes
2018-02-12 13:36:05 +01:00
Bo Maryniuk
20c952a8cb
Rename logger variable
2018-02-12 13:36:05 +01:00
Bo Maryniuk
51ba019a1a
Lintfix: remove extra-parenthesis. Remove unnecessary back-slashes
2018-02-12 13:36:05 +01:00
Bo Maryniuk
4d056a0452
Suppress logging PID file removal if running on non-root.
2018-02-12 13:36:04 +01:00
Bo Maryniuk
bcde1db2fb
Add logging
2018-02-12 13:36:04 +01:00
Nicole Thomas
d3a8f06911
Merge pull request #45927 from rallytime/utils-paths
...
Update old utils path to new path for which() function
2018-02-09 17:30:51 -05:00
Nicole Thomas
c0e01cea05
Merge pull request #45950 from rallytime/bp-45902
...
Back-port #45902 to oxygen.rc1
2018-02-09 17:30:17 -05:00
Nicole Thomas
977953cf9f
Merge pull request #45952 from rallytime/bp-45928
...
Back-port #45928 to oxygen.rc1
2018-02-09 17:28:54 -05:00
Nicole Thomas
c510498df2
Merge pull request #45951 from rallytime/bp-45742
...
Back-port #45742 to oxygen.rc1
2018-02-09 17:28:33 -05:00
Nicole Thomas
570bbc9cd7
Merge pull request #45931 from gtmanfred/publisher
...
Fix publisher_acl for oxygen
2018-02-09 15:52:49 -05:00
rallytime
5adcb6e3b2
Add missing six import in boto_cfn module
...
Since pylint was disabled for this file, the lint check must have
missed that the six import was missing.
I also updated the CLI Example formatting to match our doc boxes.
2018-02-09 15:19:15 -05:00
Erik Johnson
29d0271b73
Don't try to sort ports when translating docker input
...
This sorting was done mainly for the benefit of the test suite, but
Python 3 will raise an error when you try to sort a mixture of int and
tuple types, so sorting breaks down when there are UDP ports.
Instead, this just leaves them as an unsorted list when passed to the
API, and the test suite does the sorting before the assertEqual.
2018-02-09 11:14:03 -06:00
Gareth J. Greenaway
cda805fc3b
Fixing vault when used with pillar over salt-ssh
2018-02-09 11:44:51 -05:00
Marc Vieira-Cardinal (VA2MVC)
3a2f1040f4
Removed the chained copy
2018-02-09 11:42:32 -05:00
