rallytime
a7460cebc6
Lint fixes
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
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
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
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
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
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
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
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
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
Nicole Thomas
af033f1c93
Merge pull request #45549 from rallytime/unicode-i
...
Add unicode_literals to modules, states, tests (I)
2018-01-22 14:40:11 -05:00
rallytime
a5fc3b3363
Merge branch '2017.7.3' into '2017.7'
...
No conflicts.
2018-01-22 11:55:54 -05:00
Dmitry Kuzmenko
e119b7c55a
Fixed lint failures
2018-01-22 17:59:17 +03:00
rallytime
33a36d5433
Add unicode_literals to modules/states [z]
2018-01-22 09:57:08 -05:00
rallytime
8d54b95d8c
Add unicode_literals to modules, states, and tests [n]
2018-01-22 09:42:15 -05:00
Erik Johnson
3d3a63d237
Update tests for vmware utils
...
These were missed when updating the tests for utils T-V
2018-01-22 08:41:54 -06:00
Erik Johnson
ed530a35ad
[PY3] Add unicode_literals to salt.utils modules (T-V)
2018-01-22 08:41:52 -06:00
rallytime
2e8b86a944
Add more unicode_literals to modules, states, and test files
2018-01-22 09:32:29 -05:00
Erik Johnson
06ec8db7e2
[PY3] Add unicode_literals to more high-priority states/modules
2018-01-22 08:26:28 -06:00
Nicole Thomas
e9c7faa357
Merge pull request #45466 from rallytime/unicode-e
...
Add unicode_literals to modules, states, tests (E)
2018-01-22 08:57:30 -05:00
Erik Johnson
629e6c9674
Further fixes to for salt-ssh test under heavy load
...
This makes some further tweaks to make the test more stable under heavy
load. Firstly, the background job sleeps longer, and secondly, we make
up to 3 attempts run state.running instead of just the one, in case our
first attempt was too early. It also uses threading to make the job
sleep, since the method of adding a & to the command seemed to be
producing intermittent failures with returning clean JSON.
2018-01-22 07:33:42 -05:00
Nicole Thomas
d48230a9e6
Merge pull request #45582 from terminalmage/salt-ssh-fixes
...
Two salt-ssh fixes
2018-01-22 07:31:43 -05:00
Nicole Thomas
4260d55a62
Merge pull request #45595 from terminalmage/fix-boto-tests
...
Fix failing boto/network tests
2018-01-22 07:30:15 -05:00
Dmitry Kuzmenko
3ee328a28c
Salt Unicode Update
2018-01-22 14:38:24 +03:00
Dmitry Kuzmenko
06d3351f13
Salt Unicode Update
2018-01-22 14:38:01 +03:00
Erik Johnson
2817101041
Further fixes to for salt-ssh test under heavy load
...
This makes some further tweaks to make the test more stable under heavy
load. Firstly, the background job sleeps longer, and secondly, we make
up to 3 attempts run state.running instead of just the one, in case our
first attempt was too early. It also uses threading to make the job
sleep, since the method of adding a & to the command seemed to be
producing intermittent failures with returning clean JSON.
2018-01-21 21:19:53 -06:00
