valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
92,127 Commits 24 Branches 182 Tags 341 MiB
3219430dcc
Commit Graph

12850 Commits

Author SHA1 Message Date
Daniel Wozniak
3219430dcc
Merge pull request #47456 from dwoz/sysname 
Sysname returns text type
 2018-05-03 19:57:49 -07:00
Daniel A. Wozniak
559ee1961f
Sysname returns text type 2018-05-03 09:16:21 -07:00
Erik Johnson
3ab332ad0e
Update tests to reflect bugfix 2018-05-02 15:21:39 -05: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
Nicole Thomas
1377942bcc
Merge pull request #47405 from terminalmage/binary-diff 
Fix file.get_diff regression in 2018.3 branch
 2018-05-01 11:16:45 -04:00
rallytime
46806e595b
Update test assertion comment for pip pkgs 2018-05-01 11:08:09 -04:00
Erik Johnson
89ddb08026
Use a lambda instead of defining a one-line function 2018-04-30 14:30:01 -05:00
Nicole Thomas
c267e6083e
Merge pull request #47367 from terminalmage/issue47325 
Start docker containers with image name instead of ID
 2018-04-30 14:46:12 -04:00
Erik Johnson
e03b865359
Add unit test for file.get_diff 2018-04-30 11:45:22 -05:00
Daniel Wallace
3400f829c4
Merge pull request #47374 from DSRCorporation/bugs/tornado50-2018.3 
tornado50 merge forward for 2018.3
 2018-04-29 11:29:11 -05:00
Daniel Wallace
47b6d409d1
add io_loop handling to runtests engine 2018-04-28 11:16:26 -05:00
Daniel A. Wozniak
068f2d430d
Always sign and verify bytes 2018-04-27 16:20:18 -07:00
Daniel A. Wozniak
7810ebaba9
Add sign regression tests 2018-04-27 16:14:29 -07:00
Daniel A. Wozniak
f4441c3a1c
Adding regression test for 47124 2018-04-27 16:03:03 -07:00
Pedro Algarvio
4ae33c5d9a
Run off of a temporary config 2018-04-27 23:41:38 +03:00
Pedro Algarvio
7938b4906e
Allow running pytest>=3.5.0 2018-04-27 23:38:08 +03:00
rallytime
c7b73d132e
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-04-27 13:45:13 -04:00
rallytime
fefc0cc3ca
Update old utils paths to use new utils paths 2018-04-27 13:44:44 -04: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
798134caa3
Add regression test for creating images with image name insead of ID 
Also changed an existing test to use the new with_tempdir decorator
 2018-04-27 12:32:10 -05:00
Nicole Thomas
31db8ca7ad
Merge pull request #47347 from dwoz/test_mysql_fix_again 
Proper fix for mysql tests
 2018-04-27 13:27:52 -04:00
Daniel A. Wozniak
add78fb618
Fix linter warnings 2018-04-27 09:04:01 -07:00
Nicole Thomas
aacd5cefe3
Merge pull request #47304 from cachedout/test_cli_timeout_arg 
Pass timeout to salt CLI for tests
 2018-04-27 09:11:57 -04:00
Nicole Thomas
55534fb659
Merge pull request #47311 from Ch3LL/firewall_windows 
Add firewall execution modules tests for windows
 2018-04-27 09:10:53 -04:00
Daniel A. Wozniak
2644cc7553
Fix linter nits 2018-04-27 01:22:39 -07:00
Daniel A. Wozniak
799c601184
Proper fix for mysql tests 2018-04-27 00:22:50 -07:00
Daniel A. Wozniak
94a70e847a
Ignore gitfs tests when symlinks not enabled 2018-04-26 23:51:28 -07:00
Daniel Wozniak
dac04261b5
Merge pull request #47342 from dwoz/test_mysql_fix 
Fix mysql test cases
 2018-04-26 17:50:52 -07:00
Daniel A. Wozniak
7496f4c5a8
Fix mysql test cases 2018-04-26 15:42:46 -07: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
Nicole Thomas
a545e55543
Merge pull request #47281 from Ch3LL/system_test 
Add win_system integration module tests
 2018-04-26 12:07:40 -04:00
Nicole Thomas
b64d930df0
Merge pull request #47283 from Ch3LL/ntp_test 
Add windows ntp integration module tests
 2018-04-26 12:04:43 -04:00
Daniel A. Wozniak
d9442d043e
Skip tests not applicable to windows 2018-04-25 15:26:13 -07:00
Ch3LL
67beb1451c
Skip netstat test on macosx as its not supported 2018-04-25 16:44:28 -04:00
Daniel Wozniak
057f668788
Merge pull request #47293 from dwoz/win_build_fix 
The grp module is not available on windows
 2018-04-25 13:22:33 -07:00
Ch3LL
4e16c18c16
Add firewall module windows tests to whitelist 2018-04-25 15:26:45 -04:00
Ch3LL
4b2fc4ec66
Add windows firewall execution modules integration tests 2018-04-25 15:25:55 -04:00
Nicole Thomas
44f19b2f94
Merge pull request #47113 from jfindlay/iptables_state 
Support proto for IPSec policy extension in iptables state
 2018-04-25 14:01:18 -04:00
Nicole Thomas
b7a6206330
Merge pull request #47302 from Ch3LL/dead_code 
Remove unnecessary code from core grains and add test
 2018-04-25 13:58:47 -04:00
Nicole Thomas
fff4f8c1a5
Merge pull request #47280 from gtmanfred/localectl 
make sure not to send invalid information
 2018-04-25 13:46:44 -04:00
Daniel A. Wozniak
0386216005
Fix sneaky indention 2018-04-25 09:39:58 -07:00
Mike Place
85025af83c
Pass timeout to salt CLI for tests 
This should hopefully fix up the race condition in the long-running
jobs test.
 2018-04-25 11:04:59 -05:00
Daniel A. Wozniak
082b8d0b3d
Use salt.utils.platform 2018-04-25 08:36:32 -07:00
Nicole Thomas
0d9d55e013
Merge pull request #47106 from DSRCorporation/bugs/tornado50 
Tornado50 compatibility fixes
 2018-04-25 11:32:36 -04:00
Ch3LL
daa68b4877
Add virtual grains test for core grains 2018-04-25 11:03:35 -04:00
Nicole Thomas
89daf4fdc7
Merge pull request #47060 from OrlandoArcapix/Issue47059-return_dict_from_state 
Return an empty dict for 'changes' instead of 'None'
 2018-04-25 10:55:23 -04:00