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

12916 Commits

Author SHA1 Message Date
Shane Lee
f031710af2
Merge branch '2017.7' into fix_47024 2018-05-01 16:26:04 -06:00
twangboy
7c46d9d0d4
Fix integration.modules.test_pip 
Pass password as kwarg for runas on Windows
Fix issues with pip 10 in unit.states.test_pip
 2018-05-01 15:33:29 -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
kstreee@gmail.com
b8d37e0a1e
To add a test case for the syndic environment, copies the test case which was written by @mattp- that was already merged into develop branch, related pr is #46692. 2018-05-02 03:21:06 +09:00
kstreee
4627bad1fd
Realizes 'tgt' field into actual minions using ckminions to subscribe results of the minions before publishing a payload. 2018-05-02 02:20:56 +09:00
Ch3LL
2173b6f549
ensure we are enabling/disabling before test 2018-05-01 11:53:55 -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
Bo Maryniuk
296c589f4b Use ZMQ switch utility in the integration tests 2018-04-30 16:06:05 +02: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 A. Wozniak
67745c1362
Older GitPython versions will not have close 2018-04-29 00:50:20 -07:00
Daniel Wozniak
a5367eaf63
Merge pull request #47388 from dwoz/test_pip_fix 
Fix missing import
 2018-04-28 11:33:14 -07:00
Daniel A. Wozniak
eb26321e8b
Fix missing import 2018-04-28 10:29:30 -07:00
Daniel Wallace
9b59b991c2
Merge pull request #47380 from gtmanfred/2017.7 
add io_loop handling to runtests engine
 2018-04-28 12:25:28 -05:00
Daniel Wallace
47b6d409d1
add io_loop handling to runtests engine 2018-04-28 11:16:26 -05:00
Daniel Wallace
37822c0cbb
Merge pull request #47384 from dwoz/test_pip_fix 
Fix py2 version of pip test
 2018-04-28 10:13:28 -05:00
Daniel A. Wozniak
a37a9da1fb
Fix py2 version of pip test 2018-04-28 02:24:39 -07:00
Daniel A. Wozniak
1570708fac
Close the repo and fix multiple tests 2018-04-28 01:32:02 -07:00
Daniel Wallace
93d1445ec1
add io_loop handling to runtests engine 2018-04-27 18:51:51 -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
twangboy
22ac81df63
Fix integration.modules.test_pip 
Removes references to `no_chown`. It hasn't been in use since 2015.8
Removes usage of user in pip calls. The user is defined as the current
user which is the default anyway and it's causing tests not to run in
Windows because Windows requires a password
Removes the pwd import since it is no longer needed
 2018-04-27 15:15:34 -06: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
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
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
twangboy
3e6e524eca
Fix some tests`` 2018-04-26 22:37:15 -06: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
Ch3LL
d58be06751
Add additionatl service module integration tests and enable for windows 2018-04-26 18:13:20 -04: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
Daniel Wallace
7c212cbb2d
fix pylint 2018-04-25 08:59:25 -05:00
Nicole Thomas
ea2d68b865
Merge pull request #47255 from garethgreenaway/47239_fixes_to_salt_proxy_beacon 
[2018.3] Fixes to salt_proxy beacon and beacon tests
 2018-04-25 09:41:50 -04:00
Daniel A. Wozniak
cc2538e08f
The grp modules is not available on windows 2018-04-25 00:23:20 -07:00
Daniel A. Wozniak
7d045eb235
Fix decorator wart 2018-04-24 19:09:08 -07:00
Daniel Wozniak
da532aa1ac
Merge pull request #47285 from dwoz/core_test_fix 
Fix reg grains test
 2018-04-24 17:16:55 -07:00
Daniel Wozniak
f591cff643
Merge pull request #47290 from dwoz/test_cp_fix 
Run cache_master test in tmp dir
 2018-04-24 16:37:20 -07:00
Daniel A. Wozniak
884f4c1829
Fix extra space 2018-04-24 16:15:11 -07:00
Daniel A Wozniak
8a9027c0c9
Fix reg grains test 2018-04-24 15:05:43 -07:00
Daniel A. Wozniak
5ff51affbd
Run cache_master test in tmp dir 2018-04-24 14:58:20 -07:00
Ch3LL
ced7f86546
Add windows ntp integration module tests 2018-04-24 15:12:58 -04:00
Ch3LL
c9181a75a6
Add destructivetest decorator on tests 2018-04-24 14:44:15 -04:00
Daniel Wallace
6754787e8e
update localemod tests 2018-04-24 13:38:46 -05:00
Ch3LL
0d0c8987fc
Add win_system integration module tests 2018-04-24 14:37:14 -04:00
Gareth J. Greenaway
a2a8d78cb0
Fixing status beacon tests. 2018-04-24 08:00:06 -07:00
Gareth J. Greenaway
c87d6cae23
Ensure the salt_proxy is returning the correct tuple when the configuration is valid. Update various beacon unit tests to ensure they are testing the results of the validate function for a True result. 2018-04-24 08:00:06 -07:00
Gareth J. Greenaway
bcdef641e8
Removing target and tgt_type from the cmdline that is passed along to Salt, the target is used else where and including it in the cmdline causes problem when it is passed along. Adding an additional test to ensure we are getting the right targt. 2018-04-23 20:14:51 -07:00
Mike Place
2ed4b38b02
Merge pull request #47142 from garethgreenaway/47047_passing_pillar_to_slack_aliases 
[2018.3] pillar and output formatting fixes to Slack engine
 2018-04-23 13:55:06 -06:00
Justin Findlay
8bd08012ee
modules,states.iptables support proto for policy ext 2018-04-23 12:33:47 -07:00
Benedikt Werner
0197c3e973
Fix pip test 2018-04-23 21:05:15 +02: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
Dmitry Kuzmenko
39e403b18d
Merge branch '2017.7' into bugs/tornado50 2018-04-23 14:16:48 +03:00
Benedikt Werner
34bf66c09f
Fix pip.installed with pip>=10.0.0 2018-04-21 13:08:08 +02:00
Daniel A. Wozniak
ad9c7f63f0
Fix coverate on py3 windows builds 
Setting a value for will cause coverage to look for a config file called
named '1' and in-turn raises an Exception. Based on the docs, if the
environment variable exists coverage is enabled. Just defined the
environment variable instead of giving it a value.
 2018-04-20 12:30:43 -07:00
Pedro Algarvio
6706b3a2d1
Run off of a temporary config 2018-04-20 17:02:52 +01:00
Pedro Algarvio
d6873800d5
Allow running pytest>=3.5.0 2018-04-20 17:01:26 +01:00
Nicole Thomas
cebcd6d069
Merge pull request #47197 from dwoz/testfix 
Move process target to top level module namespace
 2018-04-20 11:41:05 -04:00
Nicole Thomas
d4269c2b70
Merge pull request #47193 from Ch3LL/network_test 
Add network module integration tests
 2018-04-20 09:37:18 -04:00
rallytime
bee4948df1
Lint: use full path for event utils function 2018-04-20 09:35:33 -04:00
Orlando Richards
5378e4fd07 Update grafana_datasource test to check for empty dict being returned on no changes, rather than None 2018-04-20 10:04:30 +01:00
Daniel A. Wozniak
25803c9176
Move process target to top level module namespace 2018-04-19 18:38:28 -07:00
Gareth J. Greenaway
6f183e1d80
Initial commmit for unit/engines/test_slack_engine 2018-04-19 18:29:49 -07:00
rallytime
120c5446b7
Update old utils paths to new utils paths 2018-04-19 17:25:55 -04:00
Nicole Thomas
c777248a78
Merge pull request #47189 from Ch3LL/autoruns 
Add autoruns.list integration test for Windows
 2018-04-19 17:16:33 -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