valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
90,020 Commits 24 Branches 182 Tags 341 MiB
b4c5d66637
Commit Graph

7382 Commits

Author SHA1 Message Date
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
Bo Maryniuk
0e3fc11ec4 Fix imports 2018-01-25 17:25:49 +01:00
Nicole Thomas
1c079f7c4c
Merge pull request #45677 from twangboy/win_fix_test_saltclass 
Fix `unit.pillar.test_saltclass` for Windows
 2018-01-25 10:08:08 -05:00
Nicole Thomas
16e4b5b57d
Merge pull request #45676 from terminalmage/ubuntu14-test-fixes 
Ubuntu 14 test fixes
 2018-01-25 09:57:50 -05:00
twangboy
317146537c
Fix paths 2018-01-25 00:43:43 +00:00
Nicole Thomas
10ce809123
Merge pull request #44903 from rallytime/raising-auth-errors 
Distinguish between Authorization and Authentication errors
 2018-01-24 17:12:38 -05:00
Nicole Thomas
2a562243b6
Merge pull request #45541 from terminalmage/py3-tier1 
[PY3] Add unicode_literals to high-priority modules/states
 2018-01-24 16:54:24 -05:00
Erik Johnson
fc92a30f7b
Ubuntu 14 test fixes 
This fixes failures which were identified in Ubuntu 14 Jenkins PR builds
 2018-01-24 15:39:08 -06:00
Nicole Thomas
36c4db07e0
Merge pull request #45578 from rallytime/unicode-changes-3 
Add unicode_literals to even more modules and states
 2018-01-24 16:33:33 -05:00
Nicole Thomas
66a38a1c61
Merge pull request #45601 from DSRCorporation/bugs/unicode_3 
Salt Unicode Update 3rd tier 3rd bunch from DK
 2018-01-24 16:32:29 -05:00
Nicole Thomas
b9b3e2e37e
Merge pull request #45610 from terminalmage/kill-six.b-with-fire 
Replace all usage of six.b
 2018-01-24 14:22:06 -05:00
rallytime
15043fd2e3
Fixup remaining test failures 2018-01-24 14:18:02 -05:00
rallytime
a7460cebc6
Lint fixes 2018-01-24 14:07:46 -05:00
Dmitry Kuzmenko
8916b91aa8
Fixed unit tests. 2018-01-24 20:37:11 +03:00
Nicole Thomas
012935892b
Merge pull request #45658 from terminalmage/tests 
Several oxygen test fixes
 2018-01-24 12:13:44 -05:00
Erik Johnson
9c86cd627a
[PY3] Add unicode_literals to high-priority modules/states 2018-01-24 10:33:58 -06:00
Nicole Thomas
5a5e780b72
Merge pull request #45566 from twangboy/win_fix_test_docker 
Fix `unit.utils.test_docker` for Windows
 2018-01-24 11:31:18 -05:00
Daniel Wallace
e827947878
Merge pull request #45618 from terminalmage/os.walk 
Fix salt.utils.path.os_walk for certain Python 2 versions
 2018-01-24 08:54:32 -07:00
Erik Johnson
d6d7da5c90
Replace all usage of six.b 
It can't be trusted to produce bytes, it returns unicode when a unicode
string is passed.
 2018-01-24 09:17:28 -06:00
Nicole Thomas
fa373e658e
Merge pull request #45476 from rallytime/unicode-h 
Add unicode_literals to modules, states, tests (H)
 2018-01-24 09:15:40 -05:00
Nicole Thomas
d5cedf6d81
Merge pull request #45560 from rallytime/unicode-changes-1 
Add unicode_literals to modules, states, and related tests
 2018-01-24 09:13:58 -05:00
Nicole Thomas
e6e977c6a0
Merge branch 'oxygen' into win_fix_test_docker 2018-01-24 09:13:28 -05:00
Nicole Thomas
189c133ebc
Merge branch 'oxygen' into bugs/unicode_3 2018-01-24 09:11:23 -05:00
Erik Johnson
b5ef58c2aa
Fix salt.utils.path.os_walk for certain Python 2 versions 
This helper was designed to ensure that the paths returned were all
unicode types, but on a couple platforms having the path be a unicode
type causes a traceback deep in the stdlib within posixpath.

To work around this, this commit makes the helper a generator that
simply decodes each tuple returned from os.walk as we iterate.
 2018-01-23 23:03:17 -06:00
Erik Johnson
21918efb5e
Update test to reflect unicode_literals 2018-01-23 19:34:25 -06:00
Erik Johnson
469d8e6e52
Fix difference between CSafeDumper and Dumper in yaml serializer test 2018-01-23 19:34:25 -06:00
Nicole Thomas
fc18995873
Merge pull request #45438 from terminalmage/py3-salt.utils-t-v 
[PY3] Add unicode_literals to salt.utils modules (T-V)
 2018-01-23 17:14:16 -05:00
Nicole Thomas
4423989ac8
Merge pull request #45587 from DSRCorporation/bugs/unicode_2 
Salt Unicode Update 3rd tier 2nd bunch from DK
 2018-01-23 17:08:59 -05:00
rallytime
fb4f2dd0fa
Distinguish between Authorization and Authentication errors 
And handle the error distiction being returned from the publish function
instead of sending empty strings.
 2018-01-23 17:05:22 -05:00
Nicole Thomas
4a116beba6
Merge pull request #45639 from rallytime/merge-oxygen 
[oxygen] Merge forward from 2017.7 to oxygen
 2018-01-23 17:03:26 -05:00
rallytime
54e154b62f
Fix test errors created with unicode changes 
- jboss_cli test: reduce test complication by not mixing raw and \u
- remove one test from test_junos: it's not really testing anything since it's heavily mocked
 2018-01-23 15:48:42 -05:00
rallytime
637ec36739
Fix state unit tests for kernelpkg 2018-01-23 15:26:26 -05:00
rallytime
ca946886f0
Lint fix 2018-01-23 15:26:26 -05:00
rallytime
c08c67f3d4
Add unicode_literals to modules, states, and related tests 2018-01-23 15:26:25 -05:00
rallytime
583a89ca6f
Update old utils paths to new paths 2018-01-23 13:34:24 -05:00
rallytime
3c298afa72
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/modules/pip.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/runners/manage.py
  - salt/states/pkg.py
  - salt/transport/zeromq.py
  - salt/utils/event.py
  - tests/integration/modules/test_pip.py
  - tests/integration/states/test_user.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_archive.py
  - tests/unit/utils/test_boto.py
 2018-01-23 13:26:43 -05:00
rallytime
10b7b0601d
Add unicode_literals to more modules, states, and tests 2018-01-23 10:08:59 -05:00
rallytime
a35cf9ca1e
Add unicode_literals to modules, states, tests (H) 2018-01-23 09:55:46 -05:00
Nicole Thomas
9facc5ede5
Merge pull request #45543 from terminalmage/py3-tier1-2 
[PY3] Add unicode_literals to more high-priority states/modules
 2018-01-23 09:38:21 -05:00
Nicole Thomas
a8dabbc150
Merge branch 'oxygen' into bugs/unicode_2 2018-01-23 07:56:21 -05:00
Nicole Thomas
ff997aa552
Merge pull request #45592 from rallytime/unicode-changes-5 
Add unicode_literals to modules, states, and tests [n]
 2018-01-23 07:50:46 -05:00
Nicole Thomas
5c907ebb15
Merge pull request #45586 from rallytime/unicode-changes-4 
Add more unicode_literals to modules, states, and test files
 2018-01-23 07:49:55 -05:00
Nicole Thomas
2cf7a806bc
Merge pull request #45557 from DSRCorporation/bugs/unicode_1 
Salt Unicode Update 3rd tier 1st bunch from DK
 2018-01-23 07:48:11 -05:00
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