Nicole Thomas
0dcaead36d
Merge pull request #47968 from gtmanfred/2017.7
...
Clean up tox + pytest
2018-06-06 17:23:51 -04:00
Daniel A Wozniak
5027c7bb84
minionswarm runs on windows
2018-06-06 14:19:16 -07:00
Gareth J. Greenaway
2ecbe9c034
fixing typo in alias_function call.
2018-06-06 13:52:45 -07:00
Gareth J. Greenaway
4377e0cc08
Some fixes to the set_pause and rm_pause function in the state runner, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality.
2018-06-06 13:52:45 -07:00
Daniel Wozniak
1ce7d6c38a
Merge pull request #47989 from dwoz/awscloud
...
Properly decode password from aws using m2crypto
2018-06-06 13:44:28 -07:00
Nicole Thomas
76068c83f5
Merge pull request #47976 from terminalmage/salt-jenkins-1000
...
Capture and log output of processes that timed out and were killed
2018-06-06 15:17:08 -04:00
Nicole Thomas
42dd6b83eb
Merge pull request #47978 from twangboy/fix_test_pkg
...
Add try/finally, fix typo in 7zip def file
2018-06-06 15:06:03 -04:00
Nicole Thomas
a67b21ef3d
Merge pull request #47959 from twangboy/fix_test_service
...
Fix failing test when service doesn't exist
2018-06-06 15:05:42 -04:00
Nicole Thomas
b81d482067
Merge pull request #47983 from garethgreenaway/backport_47843_2017_7
...
[2017.7] Backporting #47843
2018-06-06 15:03:14 -04:00
Nicole Thomas
9aada36c1c
Merge pull request #48006 from Ch3LL/rn_update
...
Update 2018.3.1 release notes with new fixes
2018-06-06 14:33:45 -04:00
Ch3LL
01e8c59296
remove duplicate changelog line
2018-06-06 14:08:35 -04:00
Ch3LL
5b8534cfb3
Update 2018.3.1 release notes with new fixes
2018-06-06 14:07:11 -04:00
Daniel Wallace
ae1b0d28bb
pass LANG and HOME into tox commands
2018-06-06 12:23:55 -05:00
Daniel Wallace
8d15b93d00
remove tox virtualenvs from doc tests
2018-06-06 12:22:22 -05:00
Nicole Thomas
d56ddad22c
Merge pull request #47533 from twangboy/fix_47178
...
Fix issues with functions that use makedirs on Windows
2018-06-06 13:20:50 -04:00
Nicole Thomas
5c56b8c755
Merge pull request #47827 from twangboy/fix_47791
...
Fix issue when archive is on mapped drive
2018-06-06 13:18:00 -04:00
Nicole Thomas
f12a52736e
Merge pull request #47990 from terminalmage/2018.3-docs
...
Docs fixes in 2018.3 release branch
2018-06-06 13:15:16 -04:00
Nicole Thomas
605463ca0d
Merge pull request #47998 from rallytime/bp-47989
...
Back-port #47989 to 2018.3.1
2018-06-06 13:08:03 -04:00
Daniel A. Wozniak
23ab2727be
Fix linter errors
2018-06-06 09:43:04 -07:00
Gareth J. Greenaway
7b7fb1f5d5
Adding missing test sls file.
2018-06-06 09:00:42 -07:00
Gareth J. Greenaway
54e51bc627
Backporting #47843 to 2017.7, updating test for 2017.7.
2018-06-06 09:00:42 -07:00
rallytime
a6533a9332
Merge branch '2017.7' into '2018.3'
...
No conflicts.
2018-06-06 11:55:29 -04:00
Bo Maryniuk
9465e5f1e9
Use to_unicode from stringutils avoid deprecation warning
2018-06-06 11:51:36 -04:00
Bo Maryniuk
73d33cbfc3
Prevent crash if files in file.recurse
2018-06-06 11:50:45 -04:00
Nicole Thomas
998a1c13d5
Merge pull request #47966 from mbunkus/fix-postfix-prefix-free-key-names-assumption
...
Fix postfix.set_main's assumption of prefix-free key names
2018-06-06 11:43:23 -04:00
Nicole Thomas
9d56af3cad
Merge pull request #47982 from twangboy/fix_test_win_dns_client
...
Fix `unit.modules.test_win_dns_client` tests
2018-06-06 11:02:10 -04:00
Nicole Thomas
1b4c72345b
Merge pull request #47985 from twangboy/fix_test_reg
...
Fix `unit.states.test_reg` test failure
2018-06-06 10:56:02 -04:00
Erik Johnson
41e5a75027
Add catch_timeout to run_script
...
One of the tests depends on forcing a timeout, but since we no longer
include the timeout message in the stdout/stderr return, we needed a way
to return whether or not the script timed out.
2018-06-06 09:04:09 -05:00
Nicole Thomas
dbc798ac68
Merge pull request #47965 from Ch3LL/gitpy_mac_3.1
...
Add PR 47924 from 2018.3 branch
2018-06-06 09:54:08 -04:00
Nicole Thomas
864d640633
Merge pull request #47973 from terminalmage/fix-testinfra
...
salt.modules.testinframod: fix TypeError invoking types.FunctionType
2018-06-06 09:53:45 -04:00
Nicole Thomas
5ddcfff420
Merge pull request #47967 from rallytime/bp-47957
...
Back-port #47957 to 2018.3.1
2018-06-06 09:53:27 -04:00
rallytime
1b7e9ac2d3
Lint fixes
2018-06-06 09:44:10 -04:00
Daniel A. Wozniak
0545152ddd
Properly decode password from aws using m2crypto
...
Fixes issue #47955
2018-06-06 09:44:05 -04:00
Erik Johnson
f89d2ccd30
Clean up Sphinx warnings
2018-06-06 08:42:21 -05:00
Daniel A. Wozniak
6c8daa2b85
Properly decode password from aws using m2crypto
...
Fixes issue #47955
2018-06-05 22:27:36 -07:00
Daniel Wallace
e1872e2036
simplify tox.ini
2018-06-05 20:41:52 -05:00
Erik Johnson
f5fc936865
Add clarifying comment so that we don't break this
2018-06-05 19:20:51 -05:00
Erik Johnson
94849780ac
fix docs build error due to IndexError
...
The `zmq` module is mocked in Sphinx, so ZMQ_VERSION_INFO ends up being
an empty tuple. Since `zmq.eventloop` and `tornado` are both mocked,
changing this from an index to a tuple comparison will prevent the
IndexError and the code within the if block will be a no-op.
2018-06-05 19:12:21 -05:00
Daniel Wallace
81bd01f5af
add tests.txt for running tests with tox requirements
2018-06-05 18:55:04 -05:00
twangboy
4ce551811f
Remove the unnecessary to_unicode stuff
2018-06-05 17:49:22 -06:00
Daniel Wallace
556a2067fc
fix masterapi test to use testing directory for configs
2018-06-05 18:36:27 -05:00
Daniel Wallace
5a41f484ef
add EXPENSIVE_TESTS
2018-06-05 18:36:27 -05:00
Daniel Wallace
055cd5a6ba
set DESTRUCTIVE_TESTS environment variable for pytest
2018-06-05 18:36:27 -05:00
twangboy
863ded39fa
Mock reg.cast_vdata
2018-06-05 15:38:28 -06:00
twangboy
2dcdf6788c
Force string to ModuleType
2018-06-05 15:27:12 -06:00
twangboy
8bb36b3a4b
Add try/finally, fix typo in 7zip def file
2018-06-05 13:29:49 -06:00
Erik Johnson
551ada8e4d
Capture and log output of processes that timed out and were killed
...
Before, tests.support.case.ShellTestCase.run_script would just go
¯\_(ツ)_/¯ and return that it killed the process. But you can still run
`.communicate()` on a process that was terminated, so this commit does
that and uses it to log the output from the killed process.
2018-06-05 13:33:39 -05:00
Nicole Thomas
4518c89484
Lint: Remove unused six import
2018-06-05 14:19:33 -04:00
Nicole Thomas
df50ce7b1b
Merge pull request #47824 from twangboy/fix_setup.py
...
Fix issues with setup.py in Windows
2018-06-05 13:39:52 -04:00
Erik Johnson
c6816b2149
salt.modules.testinframod: fix TypeError invoking types.FunctionType
...
The __name__ attribute must be a str type, unicode types will result in
a TypeError.
2018-06-05 12:22:23 -05:00
