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,983 Commits 24 Branches 182 Tags 341 MiB
47b6d409d1
Commit Graph

12792 Commits

Author SHA1 Message Date
Daniel Wallace
47b6d409d1
add io_loop handling to runtests engine 2018-04-28 11:16:26 -05: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
Daniel A. Wozniak
d9442d043e
Skip tests not applicable to windows 2018-04-25 15:26:13 -07: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
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
Daniel A. Wozniak
082b8d0b3d
Use salt.utils.platform 2018-04-25 08:36:32 -07: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
Daniel Wallace
6754787e8e
update localemod tests 2018-04-24 13:38:46 -05: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
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
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
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
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
Nicole Thomas
1947ffdf56
Merge pull request #47122 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-04-19 16:44:17 -04:00
Nicole Thomas
65f344e371
Merge pull request #47184 from Ch3LL/status_test 
Add status module integration modules tests for Windows
 2018-04-19 15:38:55 -04:00
Nicole Thomas
291cca7ed8
Merge pull request #47162 from terminalmage/bp-47161 
Partial backport of #47161 to 2018.3 branch
 2018-04-19 15:28:46 -04:00
Nicole Thomas
0a43dde5fc
Merge pull request #47185 from twangboy/add_tests 
Add additional integration tests to whitelist
 2018-04-19 14:20:24 -04:00
David Murphy
3f30ab2ed6 ZFS backport of 46933 to 2018.3.1 2018-04-19 12:08:58 -06:00
twangboy
345daa0423
Add additional integration tests to whitelist 2018-04-19 10:52:14 -06:00
rallytime
878fa06134
Test fix: remove tornado testing lib from class 
This use in the test class causing a failure in this branch that doesn't occur
in the 2017.7 branch. This tornado lib is also not necessary for this particular
test class.

This might cause a failure in the windows tests, but I have already spoken
to @dwoz about this and he is going to address this in a separate PR if needed.
 2018-04-19 12:04:58 -04:00
Ch3LL
25a84428b8
Add status module integration modules tests for Windows 2018-04-19 12:01:40 -04:00
Daniel A. Wozniak
cadd759727
Use warnings to warn user 2018-04-19 08:26:50 -07:00
Daniel A. Wozniak
144c68e214
Allow non admin name based runs on windows 2018-04-19 00:18:17 -07: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
Nicole Thomas
13ae1a2413
Merge pull request #47061 from terminalmage/issue47042 
Fix diffing binary files in file.get_diff
 2018-04-18 14:52:09 -04:00
Erik Johnson
d185f97a47
mocked file_roots and pillar_roots should be dicts 2018-04-18 13:20:07 -05:00
Nicole Thomas
d5997d2301
Merge pull request #47110 from kstreee/fix-misusing-of-timeout 
Fixes misusing of the timeout option.
 2018-04-18 13:16:19 -04:00
Nicole Thomas
b96ce23b3f
Merge pull request #47104 from terminalmage/issue46929 
yamlloader: Properly handle colons in inline dicts
 2018-04-18 12:22:46 -04:00
Daniel Wallace
50bd885ec7
Merge pull request #47107 from twangboy/fix_46932 
Fix issues with reg state, add tests
 2018-04-18 10:53:01 -05:00
Erik Johnson
87f6cefea3
Rewrite flaky utf8 state to make it easier to troubleshoot 2018-04-18 10:14:19 -05:00
Nicole Thomas
f5e63584d4
Merge pull request #47134 from Ch3LL/user_win_test 
Add user integration tests for windows OS
 2018-04-18 10:29:39 -04:00
Ch3LL
e7c9bc4038
Add user integration tests for windows OS 2018-04-17 16:45:41 -04:00
Nicole Thomas
eb5ac51a48
Merge pull request #47102 from gtmanfred/2017.7 
dont allow using no_use_wheel for pip 10.0.0 or newer
 2018-04-17 16:44:57 -04:00