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
80,339 Commits 24 Branches 182 Tags 341 MiB
4ef895e064
Commit Graph

80339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
4ef895e064
Add file to ignored paths 2017-04-01 14:22:54 +01:00
Pedro Algarvio
e72ab757a9
Use random ports. Tests cleanup. 2017-04-01 14:22:54 +01:00
Pedro Algarvio
c7faa8f80f
Py3 compat 2017-04-01 14:22:54 +01:00
Pedro Algarvio
f991143fa7
Don't run these tests under Py3. The PSF takes care of that. 2017-04-01 14:22:54 +01:00
Pedro Algarvio
f9b58aa2e2
This is not an integration test. Skip test. 
Skipping tests since I have no clue what is supposed to be tested here
with that `raise Exception(ret)` at the end.
 2017-04-01 14:22:53 +01:00
Pedro Algarvio
94c7df78ed
Skip tests on required missing libs 2017-04-01 14:22:53 +01:00
Pedro Algarvio
b2d5abc33d
Code style fixes 2017-04-01 14:22:53 +01:00
Pedro Algarvio
cde0af757e
Update tests to the new sorting 2017-04-01 14:22:53 +01:00
Pedro Algarvio
dc7169f8bd
Rename decorators in order not to be picked up by pytest as test cases 2017-04-01 14:22:53 +01:00
Pedro Algarvio
cac333e72b
Reliable sorting on both python 2 and 3 2017-04-01 14:22:52 +01:00
Pedro Algarvio
a0ecc4ff00
Fix pytest loading if a system wide salt package is installed 2017-04-01 14:22:52 +01:00
Pedro Algarvio
da7192014e
Py3 compat 2017-04-01 14:22:52 +01:00
Pedro Algarvio
655e8fde1a
Transplant configurations right after CLI parsing is complete 2017-04-01 14:22:52 +01:00
Pedro Algarvio
a013f792c6
We actually need to fix the pip state to recognize new/deprecated options 2017-04-01 14:22:52 +01:00
Pedro Algarvio
22c753afba
Disable pip wheel usage for this test. 
The pip cache dir will be owned by root and not the user created.
Revisit this issue ASAP.
 2017-04-01 14:22:52 +01:00
Pedro Algarvio
0bf7684b8c
Make the option properties available in the config mixin instead 2017-04-01 14:22:51 +01:00
Pedro Algarvio
d05028e88c
These are not integration tests 2017-04-01 14:22:51 +01:00
Shane Lee
058dcbf57e Merge pull request #40469 from twangboy/fix_nsis_script 
Fix nsis script error
 2017-03-31 20:58:56 -06:00
Nicole Thomas
f1124e1993 Merge pull request #40467 from twangboy/master_service 
Set user to 'SYSTEM' for Master to run as Service
 2017-03-31 16:53:32 -06:00
C. R. Oldham
6c714cafb9 Merge pull request #40252 from cloudflare/readd-px_keepalive 
Readd the __proxy_keepalive scheduled job
 2017-03-31 16:50:13 -06:00
twangboy
90e5022e82 Fix nsis script error 2017-03-31 15:12:41 -06:00
Mike Place
f589e3c4b6 Merge pull request #40457 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-31 14:43:50 -06:00
twangboy
c1a2a5010e Set user to 'SYSTEM' for Master to run as Service 2017-03-31 14:35:13 -06:00
Mike Place
e1363a0a60 Merge pull request #40454 from osynge/wip_master_type_func_multi_master 
Minion:Salt master can be a list or a string
 2017-03-31 14:07:35 -06:00
Mike Place
d0ed032364 Merge pull request #40441 from Ch3LL/add_vmware_cloud_tests 
Add vmware cloud tests
 2017-03-31 14:06:25 -06:00
Mike Place
2010b37e6f Merge pull request #40461 from wolfpackmars2/patch-6 
Update verify.py
 2017-03-31 14:01:46 -06:00
Mike Place
b8898fb209 Merge pull request #40360 from gtmanfred/saltutil 
allow passing args to saltutil.runner
 2017-03-31 13:18:02 -06:00
Steve Groesz
a27e8d55c6 Update verify.py 
#40366 #40394
 2017-03-31 13:32:18 -05:00
rallytime
55405bcd30 Renamed unit.modules.tuned_test.py to test_tuned.py and updated salttesting imports 2017-03-31 12:23:46 -06:00
rallytime
49463be00f Remove unused imports 2017-03-31 12:20:44 -06:00
Mircea Ulinic
31af43812d 'and' on the next line 2017-03-31 16:30:04 +00:00
Mircea Ulinic
3a0ca3e950 Simplify and more readable px keepalive condition 2017-03-31 16:30:04 +00:00
Mircea Ulinic
6720c5dea8 Load fun env & send proxy utils 2017-03-31 16:30:04 +00:00
Mircea Ulinic
1bcd332e4c Readd the __proxy_keepalive scheduled job 
Although added by @cro in #38829 - see
https://github.com/saltstack/salt/pull/38829/files#diff-b5732eecf0273ccf6a96e1c720198dc6
for very obscure reasons, these changes somehow disappeared.
Readding them, hopefully they'll resist longer this time.
 2017-03-31 16:30:04 +00:00
rallytime
2d73fca4d0 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/win_dsc.py
  - salt/modules/win_psget.py
  - tests/unit/utils/vmware_test/test_cluster.py
  - tests/unit/utils/vmware_test/test_common.py
  - tests/unit/utils/vmware_test/test_connection.py
  - tests/unit/utils/vmware_test/test_datacenter.py
  - tests/unit/utils/vmware_test/test_host.py
 2017-03-31 10:09:56 -06:00
Ch3LL
89d1f3943d remove unnecessary try blocks 2017-03-31 09:46:34 -06:00
Nicole Thomas
43066f3c67 Merge pull request #40364 from basepi/worker_threads 
Remove usually-wrong advice to raise worker threads
 2017-03-31 09:33:44 -06:00
Nicole Thomas
52ac869c68 Merge pull request #40370 from nmadhok/develop-fix-38370 
Fix vmware cloud driver issue when Required field deviceChange not provided (not @optional)
 2017-03-31 09:32:58 -06:00
Nicole Thomas
3d6d6de190 Merge pull request #40405 from twangboy/fix_win_file 
Add missing import to win_file, remove missing tests from whitelist
 2017-03-31 09:31:57 -06:00
Mike Place
5fff321468 Merge pull request #40422 from github-abcde/loader_allow-partials 
salt/loader.py: Allow functools.partial functions to be loaded from m…
 2017-03-31 09:25:26 -06:00
Nicole Thomas
864193e143 Merge pull request #40440 from cachedout/beacon_warning 
Display warning when beacon is not available
 2017-03-31 09:12:12 -06:00
Nicole Thomas
5f2a19470f Merge pull request #40385 from stefan-walluhn/develop 
Fix 'clean_pub_auth' maintenance job
 2017-03-31 09:03:14 -06:00
Nicole Thomas
1e082025e0 Merge pull request #40448 from Juniper/develop 
Correct the junos unit tests which mock getattr
 2017-03-31 08:58:22 -06:00
Owen Synge
71a69c0f41 Minion:Salt master can be a list or a string 
When you configure the salt minion you can set a single salt master, or a list
of salt masters. When using a function to provide the salt master it should not
be any different.

Signed-off-by: Owen Synge <osynge@googlemail.com>
 2017-03-31 15:34:42 +02:00
rajvidhimar
8d83d482c5 Correct the junos unit tests which mock getattr 2017-03-31 16:19:21 +05:30
Pedro Algarvio
8617be9c6d Merge pull request #40443 from gtmanfred/sshlog 
prepend ssh_log_file with root_dir
 2017-03-31 10:23:45 +01:00
Mike Place
4d0a011074 Merge pull request #40363 from sergeizv/optimize-if-statement 
Optimize if statement
 2017-03-30 16:43:01 -06:00
Mike Place
132d8b7b88 Merge pull request #40376 from nmadhok/2016.11 
Backporting changes in vmware cloud driver from develop branch to 2016.11 branch
 2017-03-30 16:35:12 -06:00
Mike Place
1e47120cbb Merge pull request #40381 from terminalmage/issue40355 
Support defining nodegroups as a dictlist as well as a dict
 2017-03-30 16:31:12 -06:00
Mike Place
dfaa670b66 Merge pull request #40387 from redbaron4/fix-39692 
More complete fix for 39692
 2017-03-30 16:29:05 -06:00