Erik Johnson
97e6b71af2
EAFP
...
If the __pycache__ dir is not present, we will get an OSError, which we
are already catching and ignoring. No need to check for that dir.
2017-12-20 08:39:41 -06:00
Erik Johnson
4951b9a60d
PY3: Make loader ignore .pyc files not in __pycache__
...
This keeps the loader from loading a PY2 .pyc file if it is present.
2017-12-20 08:39:41 -06:00
Erik Johnson
8c360dd3fb
Revert "Clear Python 2 .pyc files when Python 3 suite runs"
...
This reverts commit 7a60cfd171
2017-12-20 08:39:41 -06:00
Nicole Thomas
dafd2fc61f
Merge pull request #45083 from Ch3LL/gce_test_fix
...
Force gce cloud test name to be lowercase
2017-12-20 06:46:23 -05:00
Nicole Thomas
19997e4d81
Merge pull request #45092 from terminalmage/fix-pip-test
...
Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install
2017-12-20 05:52:08 -05:00
Nicole Thomas
b1dc0de02f
Merge pull request #45038 from terminalmage/fix-missing-exc
...
docker_image: Fix missing exc in except, pass proper args to docker.build
2017-12-19 19:50:21 -05:00
Erik Johnson
109c9936d3
Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install
...
Carbon 1.1.1 for some reason added six to their setup.py, which breaks
this test since it's not installed into the virtualenv. This PR forces
this test to use a version of carbon which does not dep on six in its
setup.py.
2017-12-19 18:37:59 -06:00
Erik Johnson
7a60cfd171
Clear Python 2 .pyc files when Python 3 suite runs
...
This prevents import errors when Python 2 .pyc files exist and the test
suite is run under Python 3.
2017-12-19 15:35:10 -06:00
Erik Johnson
e65237c390
Update test to match how file.append works
2017-12-19 15:34:31 -06:00
Erik Johnson
4501d0d6f9
Fix nested structure test for py2 and py3
2017-12-19 15:34:11 -06:00
Erik Johnson
52903e2f09
Handle non-strings passed to exception constructors
2017-12-19 15:33:07 -06:00
Erik Johnson
76011565aa
Convert line differently depending on filehandle's mode
2017-12-19 15:32:28 -06:00
Erik Johnson
7d6b679ac4
Fix fake importer for Python 3
...
Python 3 does not appear to pass all values to the `__import__` builtin
when they do not differ from the defaults. Therefore, the fake import
fails because of missing positional args.
This fix simply uses the defaults from Python 2 and 3's `__import__`
builtin.
2017-12-19 12:09:36 -06:00
Erik Johnson
016ffbe7f8
Fix incorrectly-written VMware tests
2017-12-19 12:09:36 -06:00
Erik Johnson
c6f54ecff4
Make lazydict workaround PY3-compatible
2017-12-19 12:09:36 -06:00
Erik Johnson
2d0e96385f
Fix import of ipaddress on PY3
...
This should only be imported on PY2
2017-12-19 12:09:36 -06:00
Erik Johnson
0f16821826
docker-py logs() function returns bytestrings
2017-12-19 12:09:36 -06:00
Erik Johnson
d265b671b9
Fix incorrect type coercion
2017-12-19 12:09:36 -06:00
Erik Johnson
0b81631022
Add exception logging when we fail to start the container
2017-12-19 12:09:36 -06:00
Erik Johnson
3589667927
Make sorting a list of dicts PY3-compatible
2017-12-19 12:09:36 -06:00
Erik Johnson
744329ea90
Must use six.text_type to get exception message
2017-12-19 12:09:36 -06:00
Erik Johnson
a88f1cb80e
Fix state.sls_id in salt-ssh
...
Additionally, update the other funcs to pull the SLS opts from the new
salt.uilts.state.get_sls_opts().
2017-12-19 12:09:36 -06:00
Erik Johnson
15296e59a5
Add debug logging to SSHCase
2017-12-19 12:09:35 -06:00
Erik Johnson
fa66e54dd6
Pass through SLS opts to compile_state
2017-12-19 12:09:35 -06:00
Erik Johnson
aecbd151aa
Fix incorrect use of six.string_types
2017-12-19 12:09:35 -06:00
Erik Johnson
387378c4b6
Properly support pillarenv in docker.sls_build
2017-12-19 12:09:35 -06:00
Erik Johnson
76a7c0b593
docker_image: Fix missing exc in except, pass proper args to docker.build
2017-12-19 12:09:35 -06:00
Nicole Thomas
f311c6a700
Merge pull request #43296 from lyft/upstream-boto_s3_object
...
Upstream new boto_s3 execution/state modules
2017-12-19 10:26:26 -05:00
Nicole Thomas
aea1a584a5
Merge pull request #45054 from AAbouZaid/toml_serializer
...
Add TOML serializer.
2017-12-19 10:23:22 -05:00
Ch3LL
5336dac2e1
Force gce cloud test name to be lowercase
2017-12-19 10:07:06 -05:00
Nicole Thomas
6ecb2c7d5e
Merge pull request #45076 from garethgreenaway/oxygen_fixing_failing_file_tests
...
[oxygen] fixing failing file tests
2017-12-19 09:54:55 -05:00
Gareth J. Greenaway
3270f926df
Fix for failing file comment & uncomment tests with python 3.5
2017-12-18 14:46:50 -08:00
Nicole Thomas
a4adc82ddd
Merge pull request #45064 from terminalmage/fix-sshclient
...
Fix incorrect use of six.string_types in ssh client
2017-12-18 13:13:41 -05:00
Nicole Thomas
8331d51628
Merge pull request #45041 from terminalmage/add-print_function
...
[PY3] Add print_function import to files with unicode_literals already added
2017-12-18 11:45:26 -05:00
Erik Johnson
1f43aa84fe
Fix incorrect use of six.string_types in ssh client
...
This was broken a few days ago when making PY3 incompatibility changes.
`six_text_type` needed to be used instead of `six.string_types`.
2017-12-18 08:31:38 -06:00
Nicole Thomas
0675139e2c
Merge pull request #44898 from terminalmage/revert-pr-32133
...
rest_cherrypy: revert addition of eauth user and groups to low chunks
2017-12-18 09:04:35 -05:00
Nicole Thomas
152b8aeaf2
Merge pull request #45044 from Ch3LL/fix_mac_tests
...
Fix swap_total for macosx grain detection
2017-12-18 08:56:17 -05:00
Nicole Thomas
5bd7854d27
Merge pull request #45042 from rallytime/py3-rsync-tests
...
Fix a couple of PY3 test failures in the rsync module
2017-12-16 08:18:24 -05:00
Nicole Thomas
04a2ea8cd1
Merge pull request #45019 from rallytime/merge-oxygen
...
[oxygen] Merge forward from 2017.7 to oxygen
2017-12-16 08:16:57 -05:00
Ahmed AbouZaid
696cad0d02
correct comment
2017-12-16 01:12:44 +01:00
Nicole Thomas
d933af39a6
Merge pull request #42118 from fake-name/develop
...
Patches for https://github.com/saltstack/salt/issues/42106 and https://github.com/saltstack/salt/issues/42117
2017-12-15 15:51:33 -05:00
Nicole Thomas
567c363e5c
Merge pull request #44989 from vutny/oxygen-doc-schedule-util-duplicated
...
[Oxygen] [DOC] Add doc page reference for schedule util module
2017-12-15 14:49:48 -05:00
rallytime
ecb1e3cf82
Fix a couple of PY3 test failures in the rsync module
...
Fixes:
- unit.modules.test_rsync.RsyncTestCase.test_rsync
- unit.modules.test_rsync.RsyncTestCase.test_version
2017-12-15 14:32:32 -05:00
Ch3LL
4d6abeff66
Fix swap_total for macosx grain detection
2017-12-15 14:30:13 -05:00
Nicole Thomas
561ce04bd9
Merge branch 'oxygen' into revert-pr-32133
2017-12-15 13:16:33 -05:00
Erik Johnson
8cdb9ea54f
[PY3] Add print_function import to files with unicode_literals already added
...
This makes the 2.x usage invalid syntax and forces the use of print as a
function. This adds the import to the files which I've updated in the
last couple of days but forgot to add it.
2017-12-15 12:14:18 -06:00
Nicole Thomas
73e85874d8
Merge branch 'oxygen' into upstream-boto_s3_object
2017-12-15 12:36:17 -05:00
Nicole Thomas
76a4d70449
Merge pull request #43985 from bodhi-space/caller_ref_fix
...
Quick fix for caller_ref issues in boto_route53
2017-12-15 12:35:03 -05:00
Nicole Thomas
0b88ea7eb4
Lint: Remove unused import
2017-12-15 12:31:43 -05:00
Nicole Thomas
ba0cbea689
Lint: Remove extra blank line
2017-12-15 12:31:08 -05:00
