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
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
Erik Johnson
7b615216a1
salt.utils.json: only encode data on PY2
...
We need a str type in both Python 2 and 3, and encoding produces
a bytes type on Python 3. This makes the encoding conditional, only
doing so in Python 2.
2018-01-22 16:59:05 -06:00
rallytime
62f260aa6e
"lint: disable=" should be "pylint: disable="
2018-01-22 17:25:28 -05:00
rallytime
a0700554d3
Update files with PR review comments
2018-01-22 17:16:47 -05:00
rallytime
ba2abee10e
Update PR with changes from review comments
2018-01-22 16:57:46 -05:00
rallytime
c2c85e3833
Fixup a couple of files based on PR comments
2018-01-22 16:36:11 -05:00
Dmitry Kuzmenko
e7b82b4fe6
Code review update
2018-01-22 23:38:08 +03: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
b149b0ff0e
Lint fix
2018-01-22 10:00:19 -05:00
rallytime
33a36d5433
Add unicode_literals to modules/states [z]
2018-01-22 09:57:08 -05:00
rallytime
e129d7fe68
Use six.string_types with isinstance instead of str check
2018-01-22 09:54:38 -05:00
rallytime
8d54b95d8c
Add unicode_literals to modules, states, and tests [n]
2018-01-22 09:42:15 -05:00
rallytime
74c14dafe2
Lint fix
2018-01-22 09:40:08 -05:00
rallytime
2e8b86a944
Add more unicode_literals to modules, states, and test files
2018-01-22 09:32:29 -05:00
Nicole Thomas
faa8b44de0
Merge pull request #45580 from terminalmage/aptpkg-env-py3-fix
...
aptpkg.py: Only encode env vars on PY2
2018-01-22 09:29:07 -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
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
4c5e8abf8a
Fixed lint errors
2018-01-22 14:38:01 +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
Gareth J. Greenaway
af7a29f75a
Merge pull request #45596 from terminalmage/duplicate-import
...
Remove duplicate import
2018-01-21 17:52:10 -08:00
Erik Johnson
e21f3a5a46
Remove duplicate import
2018-01-21 19:48:12 -06:00
Erik Johnson
0ac9f971f0
aptpkg.py: Only encode env vars on PY2
...
PY2 can't have unicode env vars, but bytestring env vars cause problems
for subprocess.Popen on PY3. Therefore, only encode the dict on PY2.
2018-01-21 18:50:39 -06:00
Nicole Thomas
fc0af9b2cf
Merge pull request #45491 from terminalmage/py3-encode-decode
...
Improve PY3 compatibility of salt.utils.data.decode and encode
2018-01-21 19:10:56 -05:00
Erik Johnson
033f34ee21
Fix failing boto/network tests
...
These failures were recently introduced but went undiscovered due to
some recent instability in the test suite (which has now been fixed).
This commit fixes these failing tests.
2018-01-21 17:24:11 -06:00
Nicole Thomas
37f60b1a4b
Merge branch 'oxygen' into unicode-e
2018-01-21 17:56:39 -05:00
Nicole Thomas
be36ee8749
Merge branch 'oxygen' into win_fix_test_process
2018-01-21 17:54:55 -05:00
Nicole Thomas
1a25ceca65
Merge pull request #45531 from terminalmage/py3-pkg
...
[PY3] Add unicode_literals to pkg/pkgrepo states/modules
2018-01-21 17:52:41 -05:00
Nicole Thomas
ccefc34a79
Merge pull request #45361 from terminalmage/py3-fileserver
...
[PY3] Update fileserver for Unicode/PY3 compatibility
2018-01-21 17:51:13 -05:00
Nicole Thomas
a5128e8184
Merge pull request #45584 from terminalmage/daemons-test-stability
...
Improve robustness of daemons unit tests
2018-01-21 13:08:06 -05:00
rallytime
f9d50cf6d8
Lint fix
2018-01-21 09:27:14 -05:00
rallytime
0dc7345102
Update unicode changes with proper list handling in open files
2018-01-21 09:27:14 -05:00
rallytime
9effd08bb3
Add unicode_literals to modules, states, tests (I)
2018-01-21 09:27:14 -05:00
rallytime
9778aebd94
Fix final six.text_type change from PR review
2018-01-21 09:25:58 -05:00
rallytime
4b47e8e75a
Add unicode_literals to modules, states, tests (E)
2018-01-21 09:25:58 -05:00
Erik Johnson
2926834423
Improve robustness of daemons unit tests
...
https://github.com/saltstack/salt/pull/45583 was opened to fix some test
failures in the daemons tests. However, with the way that the tests were
written, `_multiproc_exec_test` was waiting for a response from the
child function, which would never come due to the error raised during
the test. This means that any exception raised during the test would
stop the test suite dead in its tracks, causing it to eventually end in
a timeout.
This commit addresses this design flaw by wrapping the test logic in a
try/except, and ensuring that we always return a response from the child
function. The tests will instead log the exception and gracefully fail
the test, allowing whomever troubleshoots the failures to consult the
salt-runtests.log to see the traceback.
2018-01-20 22:49:02 -06:00
