valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,098 Commits 24 Branches 182 Tags 341 MiB
d83727fdf9
Commit Graph

12477 Commits

Author SHA1 Message Date
rallytime
d83727fdf9
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/cli/api.py
  - salt/client/ssh/wrapper/state.py
  - salt/config/__init__.py
  - salt/crypt.py
  - salt/daemons/masterapi.py
  - salt/key.py
  - salt/loader.py
  - salt/master.py
  - salt/modules/archive.py
  - salt/modules/hipchat.py
  - salt/modules/pip.py
  - salt/modules/state.py
  - salt/modules/virt.py
  - salt/modules/x509.py
  - salt/state.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - salt/utils/__init__.py
  - salt/utils/event.py
  - salt/utils/extmods.py
  - salt/utils/files.py
  - salt/utils/parsers.py
  - salt/utils/verify.py
  - tests/integration/shell/test_call.py
  - tests/unit/utils/test_args.py
 2018-03-06 13:45:59 -05:00
Nicole Thomas
a8f2f1b063
Merge pull request #46322 from terminalmage/issue44935 
yamlify_arg: don't treat leading dashes as lists
 2018-03-05 10:40:16 -05:00
Nicole Thomas
88b5f7383d
Merge pull request #46242 from redbaron4/fix-46127 
Pass env_vars to pip.freeze
 2018-03-05 09:53:12 -05:00
Erik Johnson
85ac6a9893
yamlify_arg: don't treat leading dashes as lists 
We had a similar check to ensure "foo: bar" isn't loaded as a dict, this
adds a check to ensure that we only load lists when there is a leading
bracket.
 2018-03-03 15:02:12 -06:00
Nicole Thomas
241611aca5
Merge pull request #46307 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.0rc1 to 2018.3
 2018-03-03 07:56:06 -05:00
Erik Johnson
61ab47ee70
Merge branch '2017.7' into merge-2017.7-2018.3 
Conflicts:
- salt/cloud/clouds/openstack.py
- salt/daemons/masterapi.py
- salt/master.py
- salt/modules/gentoo_service.py
- salt/pillar/__init__.py
- salt/pillar/git_pillar.py
- salt/runners/cache.py
- salt/runners/git_pillar.py
- salt/runners/winrepo.py
- salt/utils/docker/__init__.py
- salt/utils/gitfs.py
 2018-03-02 16:20:20 -06:00
Nicole Thomas
a0716643e4
Merge pull request #46265 from Ch3LL/profit_cloud 
Add username/password to profitbricks conf for cloud tests
 2018-03-02 16:40:21 -05:00
rallytime
c9fa21f62c
Merge branch '2018.3.0rc1' into '2018.3' 
No conflicts.
 2018-03-02 14:22:07 -05:00
Nicole Thomas
8c2c4e3316
Merge pull request #46208 from terminalmage/audit-umask-usage 
Blacklist os.umask
 2018-03-02 13:46:06 -05:00
Nicole Thomas
5ffa482343
Merge pull request #46285 from gtmanfred/2018.3.0rc1 
fix return dict for salt-ssh if something goes wrong
 2018-03-02 12:17:42 -05:00
Nicole Thomas
5416fcf6dc
Merge pull request #46275 from terminalmage/issue46274 
Make sure rest_cherrypy's config is all str types on PY2
 2018-03-02 12:15:33 -05:00
Erik Johnson
aeeb533225
Fix master conf test for PY3 
PY3 should have no non-unicode strings, this was a bug in the test
 2018-03-02 11:06:13 -06:00
Daniel Wallace
417e45686b
add unit test 2018-03-02 07:48:26 -07:00
Dmitry Kuzmenko
51c311bc1c
Payload Py3 fix and set handling. 2018-03-02 06:01:42 +03:00
Erik Johnson
2f7ae45088
Add conf file unicode test for master 2018-03-01 13:43:33 -06:00
Nicole Thomas
c490a50452
Merge pull request #45874 from GwiYeong/2017.7-local-client-hotfix 
fix for local client timeout bug
 2018-03-01 14:39:35 -05:00
Nicole Thomas
dc2833aa87
Merge branch '2018.3.0rc1' into bugs/46202_msgpack_custom_types_rework 2018-03-01 10:47:07 -05:00
Dheeraj
727ebe1056
Merge branch '2017.7' into fix-46127 2018-03-01 10:19:38 +05:30
Dmitry Kuzmenko
a664864ab1
Rework msgpack serialization of unsupported types in serial 2018-03-01 02:16:31 +03:00
Nicole Thomas
da60399b8f
Merge pull request #46183 from oeuftete/fix-docker-container-running-host-config-ulimits 
Fix docker_container.running HostConfig Ulimits comparison
 2018-02-28 17:22:11 -05:00
Nicole Thomas
7382654c70
Merge pull request #46227 from Ch3LL/smtp_file_client 
Mock file_client call in smtp return test
 2018-02-28 17:12:22 -05:00
Ch3LL
d4893eab4c
Add username/password to profitbricks conf for cloud tests 2018-02-28 17:09:28 -05:00
Dmitry Kuzmenko
4dfc44ac39
A basic fix for loading datetime objects with msgpack 2018-02-28 23:05:51 +03:00
Nicole Thomas
a97a3e6fb0
Merge pull request #46101 from jfindlay/openrc_ret 
In OpenRC exec module, make sure to ignore retcode on status
 2018-02-28 15:01:36 -05:00
Nicole Thomas
123625213e
Merge pull request #46232 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-02-28 14:16:36 -05:00
Nicole Thomas
faa90cc6c2
Merge pull request #46213 from terminalmage/unicode-opts 
PY2: Remove conversion of values from config file to str types
 2018-02-28 14:10:19 -05:00
Nicole Thomas
687575b582
Merge pull request #46238 from terminalmage/fds-in-fopen 
Don't allow salt.utils.files.fopen() to open stdin/stdout/stderr
 2018-02-28 14:08:22 -05:00
Erik Johnson
a7575aed67
Add unit test for config loading 2018-02-28 08:44:15 -06:00
Nicole Thomas
04c53f4cc4
Merge pull request #46217 from gtmanfred/2018.3.0rc1 
fix ssh integration test with enable_ssh_minions
 2018-02-28 09:32:21 -05:00
rallytime
04f24c1794
Lint: fix from a bad merge 
The TestJinjaDefaultOptions test class ended up with the TestCustomExtensions
class definition. This changes the bad merge back to the TestCase class.
 2018-02-28 09:18:27 -05:00
Dheeraj Gupta
08d1ee8baf Fix Python3 test errors 2018-02-28 16:44:29 +05:30
Dheeraj Gupta
aa9d709015 Pass env_vars to pip.freeze 
pip.installed state calls pip.freeze to check for existing installation
and to verify installation post-install. This patch propagates the
env_vars passed to pip.installed to the pip.freeze function. It also modifies
existing pip unit tests to test new functionality and adds an integration test
that verifies the expected correct behavior

Fixes #46127
 2018-02-28 16:44:20 +05:30
Erik Johnson
31b1d98fcb
Replace direct use of os.umask with use of existing context manager 
In cases where os.umask was being used simply to get the umask, a new
helper function has been added to keep improper direct usage of os.umask
from permanenly modifying the umask.
 2018-02-27 23:42:51 -06:00
Erik Johnson
586d8b0dcf
archive.extracted: don't check source file when if_missing path exists 
This exits the state early with a True result when the if_missing path
exists.
 2018-02-27 23:39:32 -06:00
Ken Crowell
5b09644429
Sort lists from Ulimits before comparing 2018-02-27 23:49:05 -04:00
Erik Johnson
fe1527a3c4
Don't allow salt.utils.files.fopen() to open stdin/stdout/stderr 
It's like crossing the streams. h/t @garethgreenaway
 2018-02-27 18:39:54 -06:00
rallytime
aad61c77bd
Update old utils paths to new paths 2018-02-27 17:20:45 -05:00
Nicole Thomas
32a0561ca8
Merge pull request #46223 from rallytime/bp-46221 
Back-port #46221 to 2018.3.0rc1
 2018-02-27 17:15:13 -05:00
rallytime
7243baf2c0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/topics/orchestrate/orchestrate_runner.rst
  - salt/grains/core.py
  - salt/modules/git.py
  - salt/pillar/ec2_pillar.py
  - salt/runner.py
  - salt/utils/ssh.py
  - tests/integration/modules/test_cp.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_file.py
  - tests/unit/modules/test_git.py
 2018-02-27 17:13:28 -05:00
twangboy
415821eee9
Fix encoding issue 2018-02-27 14:38:07 -07:00
Ch3LL
280dc9a2b6
Mock file_client call in smtp return test 2018-02-27 16:36:38 -05:00
Erik Johnson
13abc175e1
Fix hanging tests in integration suite 
A recent change to nginx appears to be causing this test to fail to
cache the test file in the temp nginx instance we've spun up. This
causes the return of cp.cache_file to be False, which in and of itself
should be enough to fail the test. But since we're not asserting on the
cp.cache_file results, flow proceeds to the next block of code, in which
we open the "file" that we cached. Some genius thought it would be a
swell idea to make io.open() successfully open a filehandle when the
path passed to it is a boolean False. When you try to read from this
filehandle, an AMAZING thing happens... It just blocks. Forever. I know,
right? Pure genius.

This commit adds an assert so that the test fails gracefully and doesn't
try to read from a bogus filehandle that SHOULDN'T EVEN EXIST.
 2018-02-27 14:58:36 -05:00
Erik Johnson
0eb012659c
Fix hanging tests in integration suite 
A recent change to nginx appears to be causing this test to fail to
cache the test file in the temp nginx instance we've spun up. This
causes the return of cp.cache_file to be False, which in and of itself
should be enough to fail the test. But since we're not asserting on the
cp.cache_file results, flow proceeds to the next block of code, in which
we open the "file" that we cached. Some genius thought it would be a
swell idea to make io.open() successfully open a filehandle when the
path passed to it is a boolean False. When you try to read from this
filehandle, an AMAZING thing happens... It just blocks. Forever. I know,
right? Pure genius.

This commit adds an assert so that the test fails gracefully and doesn't
try to read from a bogus filehandle that SHOULDN'T EVEN EXIST.
 2018-02-27 13:32:57 -06:00
Daniel Wallace
0d340757ad
fix ssh integration test with enable_ssh_minions 
Fix for MacOS
 2018-02-27 10:34:54 -07:00
rallytime
776f2ea5d7
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - salt/pillar/file_tree.py
  - tests/unit/modules/test_yumpkg.py
 2018-02-26 11:01:42 -05:00
Nicole Thomas
605e5eff73
Merge pull request #46161 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-02-26 10:29:38 -05:00
Bo Maryniuk
f00cf88c7b Fix unit test for socket data 2018-02-26 15:04:49 +01:00
Benjamin Drung
0b445f2a37 tests: Add unit tests for _parse_os_release() 
Add tests cases to fully cover _parse_os_release().

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:38:23 +01:00
Benjamin Drung
f6069b77ed Fix osfinger grain on Debian 
Rework _run_os_grains_tests() to check all os grains including osfinger.
Fix osfinger on Debian (e.g. use "Debian-9" instead of
"Debian GNU/Linux-9").

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
8dde55a761 tests: Add os_grains test cases for Debian 
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00