rallytime
c019a92610
Make minor edits from PR review
2018-01-24 14:07:46 -05:00
rallytime
83f6522986
Add unicode_literals to even more modules and states
2018-01-24 14:07:46 -05:00
Nicole Thomas
012935892b
Merge pull request #45658 from terminalmage/tests
...
Several oxygen test fixes
2018-01-24 12:13:44 -05: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
Nicole Thomas
fa32c183cd
Merge pull request #45647 from twangboy/fix_aws_util
...
Use six.text_type instead of str
2018-01-24 09:21:44 -05: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
a5abe5be68
Merge pull request #45594 from garethgreenaway/tier_three_unicode_modules_state_updates
...
[oxygen] Tier three Unicode modules state updates
2018-01-24 09:12:01 -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
0186281d7d
Fix traceback in gitfs unit tests
2018-01-23 19:49:58 -06:00
Erik Johnson
21918efb5e
Update test to reflect unicode_literals
2018-01-23 19:34:25 -06:00
Erik Johnson
cb7d262fa5
salt.utils.data.encode() doesn't work on generators
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
Erik Johnson
458fdc326c
Increase timeout for orchestration test
...
This orch test takes longer on some test VM images than others.
2018-01-23 19:34:23 -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
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
twangboy
de43636e10
Use salt.ext.six instead of six
2018-01-23 13:29:53 -07:00
rallytime
637ec36739
Fix state unit tests for kernelpkg
2018-01-23 15:26:26 -05:00
rallytime
ab99c7fbd7
Fixup small things from PR review comments
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
twangboy
b9dc4b0610
Use six.text_type instead of str
2018-01-23 13:21:05 -07:00
Gareth J. Greenaway
0d2eb72547
Requested changes.
2018-01-23 11:53:17 -08:00
Gareth J. Greenaway
b1b164a227
Couple lint fixes
2018-01-23 11:53:16 -08:00
Gareth J. Greenaway
49d0d1f1a5
Updating various modules, states and related tests for Unicode fun & profit part one.
2018-01-23 11:53:16 -08:00
Nicole Thomas
80c9787417
Merge pull request #45574 from rallytime/unicode-changes-2
...
Add unicode_literals to more modules, states, and tests
2018-01-23 13:37:46 -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
Nicole Thomas
e0394d1420
Merge pull request #45635 from rallytime/fix-lint
...
Fix Lint: Remove unused import
2018-01-23 10:44:12 -05:00
rallytime
ed4bfec242
Fix Lint: Remove unused import
2018-01-23 10:43:03 -05:00
rallytime
72e6b31314
Fixup using maketrans for PY2/PY3 and unicode
2018-01-23 10:37:32 -05:00
rallytime
ab103d4b58
Fix unicode issue with w+
2018-01-23 10:08:59 -05:00
rallytime
23683a9299
Lint fix: whitespace!
2018-01-23 10:08:59 -05:00
rallytime
10b7b0601d
Add unicode_literals to more modules, states, and tests
2018-01-23 10:08:59 -05:00
rallytime
7d2a0eb5fc
Fix hashutils issues found with tests
2018-01-23 09:55:57 -05:00
rallytime
2bef3c4b47
Apply fix from @terminalmage that got lost in rebase
2018-01-23 09:55:47 -05:00
rallytime
be926fee40
Lint fix
2018-01-23 09:55:47 -05:00
rallytime
22b16acf04
Follow up on PR reviews: don't use %s on non-logging lines
2018-01-23 09:55:46 -05:00
rallytime
a35cf9ca1e
Add unicode_literals to modules, states, tests (H)
2018-01-23 09:55:46 -05:00
Daniel Wallace
0e2628a8aa
Merge pull request #45632 from gtmanfred/oxygen
...
pull minion log from kitchen sandbox
2018-01-23 07:39:37 -07:00
Daniel Wallace
3c9eed8929
pull minion log from kitchen sandbox
2018-01-23 07:38:36 -07: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
0e50abd7f7
Merge pull request #45593 from rallytime/unicode-changes-6
...
Add unicode_literals to modules/states [z]
2018-01-23 07:52:03 -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
