rallytime
786076ac03
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- pkg/windows/modules/get-settings.psm1
- salt/modules/cmdmod.py
- salt/modules/pip.py
- salt/modules/win_lgpo.py
- salt/states/pip_state.py
- tests/integration/states/test_pip.py
- tests/support/helpers.py
- tests/unit/modules/test_pip.py
- tests/whitelist.txt
2018-05-07 13:17:01 -04:00
Nicole Thomas
fa293f8fac
Merge pull request #47435 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-05-04 09:05:32 -04:00
Daniel A. Wozniak
ca9393b7fb
Skip tests not applicable to windows
2018-05-03 19:55:46 -07:00
rallytime
a94cdf8a0d
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/daemons/flo/zero.py
- salt/minion.py
- salt/pillar/pillar_ldap.py
- salt/transport/zeromq.py
- salt/utils/async.py
- salt/utils/zeromq.py
- tests/integration/modules/test_service.py
- tests/integration/netapi/rest_tornado/test_app.py
- tests/unit/fileserver/test_gitfs.py
- tests/unit/modules/test_pip.py
2018-05-02 15:00:40 -04:00
Shane Lee
f031710af2
Merge branch '2017.7' into fix_47024
2018-05-01 16:26:04 -06:00
Nicole Thomas
0bdfaa5ffe
Merge pull request #47368 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-05-01 14:56:19 -04:00
Erik Johnson
89ddb08026
Use a lambda instead of defining a one-line function
2018-04-30 14:30:01 -05:00
Erik Johnson
e03b865359
Add unit test for file.get_diff
2018-04-30 11:45:22 -05:00
Daniel A. Wozniak
eb26321e8b
Fix missing import
2018-04-28 10:29:30 -07:00
Daniel A. Wozniak
a37a9da1fb
Fix py2 version of pip test
2018-04-28 02:24:39 -07:00
rallytime
13e8124031
Merge branch '2017.7' into '2018.3'
...
Due to the many merge conflicts created from #47106 against the 2017.7 branch
and #46002 against the 2018.3 branch, the changes from #47106 have been largely
removed from this merge forward and the HEAD of 2018.3 was taken.
A separate fix for Tornado 5.0 support will need to be made directly against the
2018.3 branch.
Conflicts:
- doc/topics/development/conventions/formulas.rst
- salt/master.py
- salt/minion.py
- salt/netapi/rest_tornado/saltnado.py
- salt/states/zfs.py
- salt/transport/ipc.py
- salt/transport/tcp.py
- salt/transport/zeromq.py
- salt/utils/async.py
- tests/support/helpers.py
- tests/support/parser/cover.py
- tests/unit/grains/test_core.py
- tests/unit/modules/test_ssh.py
- tests/unit/test_minion.py
- tests/unit/utils/test_safe_walk.py
2018-04-27 13:38:35 -04:00
Erik Johnson
37a13d8004
Update pip unit tests to reflect changes
2018-04-27 09:47:18 -05:00
Erik Johnson
7f86779be0
Lint fix
2018-04-27 09:18:53 -05:00
Daniel A. Wozniak
94a70e847a
Ignore gitfs tests when symlinks not enabled
2018-04-26 23:51:28 -07:00
twangboy
3e6e524eca
Fix some tests``
2018-04-26 22:37:15 -06:00
Daniel Wozniak
e4779f3246
Merge pull request #47339 from dwoz/ssh_key_test_fix
...
Use salt.utils.fopen for line ending consistancy
2018-04-26 15:39:55 -07:00
Daniel A. Wozniak
e37a93a1ca
Remove redundent close call
2018-04-26 13:47:11 -07:00
Daniel A. Wozniak
b2ae5889b7
Close the temporary file handle
2018-04-26 12:52:08 -07:00
Daniel A. Wozniak
9f7f83a975
Use salt.utils.fopen for line ending consistancy
2018-04-26 12:43:51 -07:00
Daniel A. Wozniak
dcb6a22c00
Remove un-needed string-escape
2018-04-26 11:28:25 -07:00
Daniel Wallace
7c212cbb2d
fix pylint
2018-04-25 08:59:25 -05:00
Daniel Wallace
6754787e8e
update localemod tests
2018-04-24 13:38:46 -05:00
Justin Findlay
8bd08012ee
modules,states.iptables support proto for policy ext
2018-04-23 12:33:47 -07:00
Nicole Thomas
370feadbd2
Merge pull request #47186 from dmurphy18/zfs_backport_46933
...
backport of issue 46933, updated ZFS handling to Salt 2018.3.x
2018-04-23 10:07:05 -04:00
rallytime
4718d31e53
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/config/__init__.py
- salt/minion.py
- salt/modules/pip.py
- salt/states/pip_state.py
- salt/states/virtualenv_mod.py
- tests/integration/modules/test_status.py
2018-04-19 17:15:20 -04:00
David Murphy
3f30ab2ed6
ZFS backport of 46933 to 2018.3.1
2018-04-19 12:08:58 -06:00
Erik Johnson
048728d2b7
Remove unused imports
2018-04-18 19:46:32 -05:00
Erik Johnson
879c557264
Use decorators for temp files/dirs in test suite
...
This adds a new decorator which creates a temporary directory and cleans
it after the test completes. It also modifies an existing decorator for
creating temporary files so that it accepts arguments, which will be
passed through to salt.utils.files.mkstemp().
2018-04-18 19:46:29 -05:00
Daniel Wallace
3dc93b310b
fix tests
2018-04-17 13:18:18 -05:00
rallytime
590c7fc13f
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/state.py
- salt/utils/files.py
- tests/integration/modules/test_pip.py
2018-04-11 12:41:22 -04:00
Nicole Thomas
8f994e7cf9
Merge pull request #46539 from jfoboss/patch-1
...
#46504 Fix
2018-04-11 10:13:23 -04:00
twangboy
19c3fadbe5
Fix unit test for win_ntp
2018-04-10 12:12:17 -06:00
Peter Morris
44ecd13abc
Update tests to use cmd.run_all
2018-04-10 01:11:03 +01:00
Nicole Thomas
67894e3ee9
Merge pull request #46869 from gtmanfred/2018.3
...
Always return dictionary for _localectl_status
2018-04-05 09:25:13 -04:00
Daniel Wallace
1496e985f7
fix pylint
2018-04-04 15:13:59 -05:00
Daniel Wallace
75425dfd20
fix tests for localemod
2018-04-04 09:58:21 -05:00
rallytime
893196d3e6
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/conf.py
- salt/loader.py
- salt/modules/dockermod.py
- salt/modules/sensehat.py
- salt/utils/parsers.py
- tests/integration/cloud/providers/test_ec2.py
- tests/integration/modules/test_cp.py
- tests/integration/modules/test_groupadd.py
- tests/integration/spm/test_man_spm.py
- tests/integration/states/test_npm.py
- tests/unit/states/test_environ.py
2018-04-03 14:33:11 -04:00
Nicole Thomas
df26f2641e
Merge pull request #46675 from dwoz/inspectlib-tests
...
Skip test when git symlinks are not configured
2018-04-03 08:19:18 -04:00
Daniel A. Wozniak
d39f4852d8
Handle non-zero status exception
2018-03-29 14:39:40 -07:00
Daniel A. Wozniak
83c005802b
Handle cases where git can not be found
...
Signed-off-by: Daniel A. Wozniak <dwozniak@saltstack.com>
2018-03-29 14:39:29 -07:00
rallytime
e312efb5e7
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/man/salt-api.1
- doc/man/salt-call.1
- doc/man/salt-cloud.1
- doc/man/salt-cp.1
- doc/man/salt-key.1
- doc/man/salt-master.1
- doc/man/salt-minion.1
- doc/man/salt-proxy.1
- doc/man/salt-run.1
- doc/man/salt-ssh.1
- doc/man/salt-syndic.1
- doc/man/salt-unity.1
- doc/man/salt.1
- doc/man/salt.7
- doc/man/spm.1
- salt/modules/cmdmod.py
- salt/modules/pillar.py
- salt/modules/yumpkg.py
- salt/state.py
- salt/utils/pkg/rpm.py
- salt/utils/schedule.py
- tests/integration/states/test_npm.py
- tests/integration/states/test_pkgrepo.py
2018-03-27 16:31:55 -04:00
rallytime
00d4eb26f3
Merge branch '2018.3.0rc1' into '2018.3'
...
Conflicts:
- pkg/windows/req.txt
2018-03-27 11:41:56 -04:00
Gareth J. Greenaway
042930bd3b
A couple more fixes to ensure everything works consistently under python2 and python3, adjusting things that should be bytes and things that should be strings. Updating tests to reflect changes.
2018-03-26 21:51:51 -07:00
Nicole Thomas
0faced1d54
Merge pull request #46565 from twangboy/win_fix_cmd_powershell_2018.3
...
Create reg salt util (2018.3)
2018-03-26 18:03:33 -04:00
Daniel A Wozniak
628b87d5c4
Skip test when git symlinks are not configured
2018-03-22 23:30:15 -07:00
twangboy
0de54ed953
Additional tests
...
Adds additional tests for unicode scenarios
Fixes an issue with reg.py when deleting unicode keys
Puts the destructive tests in a try/except block so the delete occurs no
matter what
Uses a randomly generated key name for testing
2018-03-22 15:59:46 -06:00
Michael Calmer
3ceb63f607
fix checking test results
2018-03-22 16:31:46 +01:00
Michael Calmer
af64632bf3
add unit test for failed login
2018-03-22 08:57:16 +01:00
Erik Johnson
e8582e80f2
Python 3-compatibility fix to unit test
...
This should not be returning a string type for stderr, since
Popen.communicate() returns a bytestring. In Python 2, the str and bytes
types are the same, but the same is not true in Python 3.
Additionally, the mocking here seems not to consider the fact that Popen
is called when runas is used to get the runas user's environment. Since
this test doesn't care about the output, we can just make the mocked
Popen.communicate() return an empty bytestring.
2018-03-20 22:09:18 -05:00
rallytime
b03cda3cea
Merge branch '2018.3.0rc1' into '2018.3'
...
No conflicts.
2018-03-20 09:13:13 -04:00
