Nicole Thomas
f093fe1af0
Merge pull request #45095 from terminalmage/py3-loader
...
PY3: Make loader ignore .pyc files not in __pycache__
2017-12-27 18:23:35 -05:00
Nicole Thomas
42185b79b8
Merge branch 'oxygen' into py3-loader
2017-12-27 13:42:44 -05:00
Erik Johnson
7b13a7df8b
Replace json module usage with a helper to ensure unicode content is handled properly
...
This adds wrappers for json.dump{,s} which disable `ensure_ascii` by
default.
2017-12-27 09:30:58 -06:00
Erik Johnson
a73c380341
Don't use include-test SLS in orch tests
...
This was the _actual_ cause of the failing test in the state module
integration tests.
2017-12-24 12:49:45 -06:00
Erik Johnson
4bf072435d
Fix integration.modules.test_state.StateModuleTest.test_exclude
...
test_exclude shares file paths with test_include, and while I can't
reproduce the failures, it is likely that improperly cleaned-up files
from test_include are causing the failures in test_exclude. This is
backed up by the fact that the state.sls return data from the
salt-runtests.log shows no trace of the "to-include-test" file
(suggesting it was excluded as expected), yet os.path.isfile() returns
True for this path, causing the test to fail.
This commit uses a distinct base dir for both tests, which should keep
this sort of failure from happening.
2017-12-24 12:08:57 -06:00
Erik Johnson
d9a915fdc9
Update mocking in unit.grains.test_core.CoreGrainsTestCase.test_docker_virtual
...
This fixes this test in Oxygen, where the function name has changed.
2017-12-23 19:47:37 -06:00
rallytime
9ded5e1cbb
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- salt/config/__init__.py
- salt/grains/core.py
- salt/modules/win_lgpo.py
- salt/returners/mysql.py
- salt/states/libcloud_dns.py
- tests/integration/runners/test_runner_returns.py
- tests/unit/grains/test_core.py
2017-12-21 15:58:08 -05:00
Nicole Thomas
b49ee97938
Merge pull request #45124 from gtmanfred/2017.7
...
enable using kitchen-salt with ec2 on 2017.7
2017-12-21 14:11:27 -05:00
Daniel Wallace
d0586013eb
fix pylint
2017-12-21 10:40:54 -07:00
Gareth J. Greenaway
98a9ddf10c
Merge branch 'oxygen' into scheduler_fixes_loop_interval
2017-12-21 08:36:09 -08:00
Daniel Wallace
59e2e56d13
chmod the xml files before trying to copy
2017-12-21 08:17:10 -07:00
Daniel Wallace
a5c1410e23
catch IOError when copying xml files back
2017-12-20 18:26:18 -07:00
Daniel Wallace
23bd38ad66
enable using kitchen-salt on ec2
...
These changes are needed to run the test suite on ec2 using sudo.
2017-12-20 17:18:39 -07:00
Nicole Thomas
42e894570d
Merge pull request #45087 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-20 17:24:50 -05:00
Nicole Thomas
21de54de44
Merge pull request #45105 from rallytime/utils-path-update
...
Update old utils paths to new paths
2017-12-20 17:22:29 -05:00
Ch3LL
1bd7110a14
Fix spm big file build test to check /tmp
2017-12-20 14:40:10 -05:00
rallytime
fe81e2d39a
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-12-20 10:26:10 -05: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
rallytime
ec2a32a106
Update old utils paths to new paths
2017-12-20 08:03:14 -05:00
Michael Calmer
744e698689
adapt tests to reflect reality
...
When CherryPy run with python3 it reads "bytes" from the wire.
In case of python2 BytesIO == StringIO, so nothing should change.
This change will do the same to make unit tests reflect reality.
2017-12-20 06:59:56 -05:00
Erik Johnson
80b6bd6813
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-20 06:54:30 -05: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
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
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
15296e59a5
Add debug logging to SSHCase
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
Nicole Thomas
e0d7b330fa
Merge pull request #44650 from frogunder/status
...
add status.pid test
2017-12-19 11:21:08 -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
Gareth J. Greenaway
8c5d515ccd
Merge branch 'oxygen' into scheduler_fixes_loop_interval
2017-12-18 15:24:16 -08: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
Gareth J. Greenaway
047e76cb31
Merge branch 'oxygen' into scheduler_fixes_loop_interval
2017-12-18 08:10:39 -08: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
Nicole Thomas
5137be01ec
Merge pull request #44951 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-16 08:16:23 -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
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
81ded2aaba
Merge pull request #44533 from cloudflare/nested-colors
...
Nested outputter colors depending on the function retcode
2017-12-15 12:28:02 -05:00
Nicole Thomas
abf34064a1
Merge pull request #44916 from jasperla/status/openbsd/meminfo
...
status.meminfo: add OpenBSD support
2017-12-15 12:25:56 -05:00
Nicole Thomas
4e56835221
Merge pull request #45032 from terminalmage/renderers-returners-unicode
...
[PY3] Add unicode_literals to renderers and returners
2017-12-15 12:04:46 -05:00
Nicole Thomas
129115ee35
Merge pull request #45028 from terminalmage/runners-unicode
...
[PY3] Add unicode_literals to runner modules
2017-12-15 12:04:22 -05:00
Nicole Thomas
e631ce1276
Merge pull request #45030 from terminalmage/moar-unicode
...
[PY3] Add unicode_literals to tops, thorium, proxy, tokens
2017-12-15 12:04:05 -05:00
Gareth J. Greenaway
63a22349d5
Random LOOP_INTERVALS should end at 59 seconds.
2017-12-15 08:53:17 -08:00
