valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,078 Commits 24 Branches 182 Tags 341 MiB
e550590ac5
Commit Graph

2822 Commits

Author SHA1 Message Date
Thomas S Hatch
77d709a29c Merge pull request #14601 from lyft/provide-vpc-exists-support 
Provide vpc exists support
 2014-08-04 10:16:38 -06:00
Thomas S Hatch
1bd88cab28 Merge pull request #14535 from steverweber/template_var 
add two vars to the templates slspath and tplpath
 2014-08-04 10:06:07 -06:00
Colin Johnson
8dd88066f7 boto_asg now support use of security group names in launch configs 2014-08-04 00:04:20 +00:00
Colton Myers
0307fdbe9a Merge branch '2014.7' into develop 
Conflicts:
	salt/runners/manage.py
 2014-08-01 10:52:52 -06:00
Colton Myers
2bfcbe01d0 Merge pull request #14661 from rallytime/fix_rhel7_test 
Add GPG key file to integration tests
 2014-07-31 16:34:47 -06:00
Michael Birtwell
32acb7aeae Pull out pending_events changes and reuse 
PendingEventsBase implements all the pending_events queue management
Make both normal SaltEvent and raetevent.SaltEvent inherit from this to
standardise the get_event interface.
Update tests for event.SaltEvent (Couldn't find tests for
raetevent.SaltEvent)
 2014-07-31 12:23:38 -06:00
rallytime
f5597010ca Add GPG key file to integration tests 2014-07-31 10:57:49 -06:00
Pedro Algarvio
586642576a Add another which only changes the noc 2014-07-30 19:34:00 +01:00
Pedro Algarvio
a53ca96c76 Add another example for version comparison 2014-07-30 19:34:00 +01:00
Pedro Algarvio
4ccb73abac Add another version example to the tests 2014-07-30 19:33:59 +01:00
Pedro Algarvio
b24e1b9c49 Support a minor bugfix attribute in the version string 2014-07-30 19:33:59 +01:00
Pedro Algarvio
3a16b42eb9 Add another which only changes the noc 2014-07-30 18:10:22 +01:00
Pedro Algarvio
7a77942a82 Add another example for version comparison 2014-07-30 18:10:16 +01:00
Pedro Algarvio
fc239f8cd9 Add another version example to the tests 2014-07-30 18:10:09 +01:00
Pedro Algarvio
827ccd5338 Support a minor bugfix attribute in the version string 2014-07-30 18:10:02 +01:00
Colin Johnson
3bcfd4bb0d unit tests for boto_vpc module 2014-07-30 07:29:45 +00:00
steverweber
0b764c5b69 add two vars to the templates slspath and tplpath 2014-07-29 09:53:19 -04:00
Thomas S Hatch
aeda9730ca Merge pull request #14460 from steverweber/fix_restarts 
fix issues with keepalive minion
 2014-07-25 21:46:01 -06:00
Seth House
d7d8beabb8 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-07-25 19:55:43 -06:00
Seth House
adabf74852 Added utils module for working with hash functions 2014-07-25 16:12:37 -06:00
Thomas S Hatch
6e575491ee Merge pull request #14506 from whiteinge/netapi-client-config 
Load netapi modules using client config instead of master config
 2014-07-25 15:49:02 -06:00
Seth House
ac6c7d0d6d Added utils-style IP-check functions to the network module 2014-07-25 15:20:14 -06:00
Seth House
c046f1cac7 Revert "Switch NetapiClient to use client_config instead of master_config" 
This partially reverts commit 2bc1ed8afb.
 2014-07-25 14:42:19 -06:00
Thomas S Hatch
263ed1ad90 Merge pull request #14503 from robmessick/gem_state_prereleases 
Add support for pre_releases argument to the gem state
 2014-07-25 14:26:20 -06:00
Thomas S Hatch
641eaa7b03 Merge pull request #14298 from mbirtwell/dont_drop_events_during_gather_job_info 
Dont drop events during gather job info
 2014-07-25 14:04:44 -06:00
Thomas S Hatch
db5e572760 Merge pull request #14269 from whiteinge/test-dotlookup-notation 
Add a bug fix plus tests for calling functions in Jinja via dot-lookup notation
 2014-07-25 14:04:03 -06:00
Rob Messick
4549ef25a2 Add support for pre_releases argument to the gem state 2014-07-25 12:30:42 -07:00
steverweber
bf8f936fa4 fix issues with keepalive minion 2014-07-25 15:13:05 -04:00
Thomas S Hatch
a00e84b556 Merge branch '2014.7' into develop 2014-07-25 12:55:42 -06:00
C. R. Oldham
253de7a995 PyLint fix. 2014-07-25 12:48:07 -06:00
Seth House
0d8cc41c61 Added tests for calling functions via Jinja with dot-lookup syntax 
Yay!
 2014-07-25 12:27:45 -06:00
C. R. Oldham
f53e477735 Merge commit, resolve conflict 2014-07-25 11:16:22 -06:00
C. R. Oldham
c94808689d Extend dot-in-pkg test to RHEL 5 as well 2014-07-25 10:57:18 -06:00
Colton Myers
e7bd8bf00d Merge branch '2014.7' into develop 2014-07-25 10:43:55 -06:00
Thomas S Hatch
288e9bba29 TABS?!?!? Really @cro ?? 2014-07-25 10:39:19 -06:00
Thomas S Hatch
35c3614f7f Merge branch 'rhel7_pkgtests' of https://github.com/cro/salt into cro-rhel7_pkgtests 2014-07-25 10:38:10 -06:00
Thomas S Hatch
558e2283d1 Merge pull request #14474 from robmessick/issue14469 
add optional pre_releases argument to gem.install
 2014-07-25 10:34:38 -06:00
Thomas S Hatch
8e0d8a7b9f Merge branch '2014.7' into develop 2014-07-25 10:30:07 -06:00
Thomas S Hatch
0577b4070b lint fix 2014-07-25 10:21:31 -06:00
Thomas S Hatch
f3e6841401 Merge pull request #14452 from s0undt3ch/hotfix/osx-pyt-nr 
Skip test on Darwin after making an effort
 2014-07-25 10:20:10 -06:00
Rob Messick
74cf92331b add optional pre_releases argument to gem.install 2014-07-24 17:26:27 -07:00
C. R. Oldham
1891b07856 Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:11:56 -04:00
C. R. Oldham
b6f70ac80f Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:09:52 -04:00
Seth House
2bc1ed8afb Switch NetapiClient to use client_config instead of master_config 
We access the Salt master through client interfaces and should use the
correct config when doing so. We should also reuse the already-loaded
opts when instantiating LocalClient().
 2014-07-24 16:08:31 -06:00
Seth House
33043ef919 Added NetapiClient integration tests 2014-07-24 16:08:31 -06:00
Seth House
bd72c35f7c Add tests for the cmd_sync and cmd_async RunnerClient methods 2014-07-24 16:08:30 -06:00
Seth House
c34cddcfbb Move eauth_creds to class-level for reuse 2014-07-24 16:08:30 -06:00
Seth House
b077b2436e Add 'auto' eauth backend for tests 2014-07-24 16:08:30 -06:00
Seth House
fed58155bc Merge remote-tracking branch 'upstream/2014.7' into develop 2014-07-24 16:04:39 -06:00
C. R. Oldham
9dc3f696ca Fix two RHEL7 tests 2014-07-24 14:11:03 -07:00
Pedro Algarvio
ea01af39b4 Skip test on Darwin after making an effort 2014-07-24 13:12:46 +01:00
Colin Johnson
c8e8bf1577 LYFT-14491 - unit tests for rule modification 2014-07-23 22:59:38 +00:00
Colin Johnson
2ad52a5c06 LYFT-14491 - states unit test for rule modification 2014-07-23 22:59:28 +00:00
rallytime
9b9a60efea Skip vt_test in os x - still needs some work to run 2014-07-23 14:40:03 -06:00
Nicole Thomas
486dbe3476 Merge pull request #14389 from s0undt3ch/hotfix/osx-pyt-nr 
Allow the VT tests to run on OSX
 2014-07-23 14:38:58 -06:00
Pedro Algarvio
6c7e39dfcd Factor out into a function the current number of PTY's detection code 2014-07-23 19:43:18 +01:00
rallytime
51c7b95e6f Give rhel5 a chance to pass the cache tests 2014-07-22 15:38:54 -06:00
rallytime
a3da60def4 Remove unnecessary print statement 2014-07-22 12:16:39 -06:00
Pedro Algarvio
fa2149e1da Allow the VT tests to run on OSX 2014-07-22 15:20:03 +01:00
rallytime
7bb5ef3773 Skip lxc tests if no lxc and skip failing vt_test if running osx 2014-07-21 17:11:20 -06:00
rallytime
73b185cb72 Allow OSX to run tests with change to TMPDIR 2014-07-21 14:26:59 -06:00
rallytime
c70c8ee5aa Remove cloud_config tests for deprecated arguments 2014-07-17 16:41:11 -06:00
Thomas S Hatch
ef277feba1 Merge pull request #14314 from cachedout/grains_raet 
Increase timeout for grains test
 2014-07-17 15:51:37 -06:00
Thomas S Hatch
5a8a5c3485 Merge pull request #14300 from pass-by-value/more_matcher_test_fixes 
Ensure tests pass on raet and zmq
 2014-07-17 14:19:39 -06:00
Mike Place
919e9db946 Increase timeout for grains test 2014-07-17 13:27:08 -06:00
Aditya Kulkarni
88a873a171 Ensure tests pass on raet and zmq 2014-07-17 10:32:07 -04:00
Michael Birtwell
e832a3a17f Pull out pending_events changes and reuse 
PendingEventsBase implements all the pending_events queue management
Make both normal SaltEvent and raetevent.SaltEvent inherit from this to
standardise the get_event interface.
Update tests for event.SaltEvent (Couldn't find tests for
raetevent.SaltEvent)
 2014-07-17 13:18:30 +01:00
rallytime
81e06fa252 Removed deprecated functions in salt/modules/ps.py 2014-07-16 12:49:45 -06:00
Colton Myers
11bfbd7a85 Merge pull request #14272 from rallytime/deprecate_check_dns 
Deprecate check_dns
 2014-07-16 11:44:32 -06:00
rallytime
dfb8894e6a Remove unused imports 2014-07-16 06:41:28 -06:00
rallytime
6733f45924 Removed deprecated references to check_dns 2014-07-16 06:26:08 -06:00
rallytime
1c3737a883 Remove remaining references and tests to no_site_packages 2014-07-16 06:00:08 -06:00
rallytime
4d329296b0 Remove unused import 2014-07-15 18:15:58 -06:00
rallytime
534f3df900 Remove test for no_site_packages deprecation 2014-07-15 17:28:40 -06:00
Thomas S Hatch
6abccbc0cf fix this better, don't use clean_proc from master.py. 2014-07-15 15:06:15 -06:00
Mike Place
6b572eaa4b Merge pull request #14253 from pass-by-value/matcher_test_raet_compat 
Matcher test raet compat
 2014-07-15 14:53:57 -06:00
Aditya Kulkarni
615e0b7550 Add timeouts to wait longer 2014-07-15 16:50:32 -04:00
Aditya Kulkarni
978ae5fb51 Make sure test_grain passes with raet 2014-07-15 16:27:47 -04:00
Nicole Thomas
6a5f00c3ce Merge pull request #14244 from rallytime/fix_cache_tests 
Change python asserts to unittest asserts
 2014-07-15 13:10:19 -06:00
Thomas S Hatch
da8612ddcc Merge pull request #14243 from cachedout/masterswarm 
Refactor into base swarm and master/minion swarm
 2014-07-15 12:22:46 -06:00
rallytime
7bea8f5cb6 Change python asserts to unittest asserts 2014-07-15 11:56:50 -06:00
Mike Place
200ef6b642 Refactor into base swarm and master/minion swarm 2014-07-15 11:31:07 -06:00
Thomas S Hatch
25a4df3566 Merge pull request #14238 from rallytime/fix_spelling 
Fix spelling error: doctring -> docstring
 2014-07-15 10:41:16 -06:00
Thomas S Hatch
4e91eee9ca Merge pull request #14228 from terminalmage/issue13873 
Fix regression in templating local files
 2014-07-15 10:38:45 -06:00
rallytime
486aa982ad Fix spelling error: doctring -> docstring 2014-07-15 09:26:55 -06:00
Leonids Maslovs
6c3973ec05 WIP 13793 Unit tests fixed 2014-07-15 13:19:07 +03:00
David Boucha
8bddefc53b Merge pull request #14229 from whiteinge/rest_cherrypy-run-sessions 
Add rest_cherrypy tests for the /run entrypoint; fix session reference when sessions are disabled
 2014-07-15 02:12:15 -06:00
Seth House
63be4efae9 Added basic smoke-tests for the rest_cherrypy /run entrypoint 2014-07-14 22:11:20 -06:00
Erik Johnson
2939eaec15 Clean up filehandle usage in file state tests 
This does a few things:

1. Change calls to open() to use salt.utils.fopen()

2. Use with blocks where applicable
 2014-07-14 21:23:06 -05:00
Erik Johnson
f847bae5a2 Add tests for templating local files 2014-07-14 21:23:06 -05:00
Seth House
2dad062f8a Move rest_cherrypy mocked methods into individual tests 2014-07-14 20:18:21 -06:00
Pedro Algarvio
850e38d9eb Ignore W0221 2014-07-15 01:44:03 +01:00
Pedro Algarvio
698784d1e7 White-space lint fix 2014-07-15 01:43:52 +01:00
Thomas S Hatch
778f3aa55d Merge pull request #14218 from cachedout/masterswarm 
Basic master support for minionswarm
 2014-07-14 17:15:04 -06:00
Seth House
c25e658420 Use the test suite __opts__ instead of custom dict 
Better approach now that we're in Salt core.
 2014-07-14 17:09:25 -06:00
Mike Place
83ce730ec2 Basic master support for minionswarm 2014-07-14 16:59:44 -06:00
Thomas S Hatch
09f5ad951b Merge pull request #14210 from pass-by-value/raet_key_test_refactor 
Refactor salt key tests to be raet compatible
 2014-07-14 16:07:43 -06:00
Thomas S Hatch
8435329d91 Merge pull request #14209 from cachedout/master_config 
Small refactor
 2014-07-14 16:06:09 -06:00
Thomas S Hatch
181dfdfb75 Merge pull request #14202 from cachedout/env_test_remove 
pip test fixup and module cleanup
 2014-07-14 16:00:56 -06:00
Mike Place
457a33d633 Fix test errors 2014-07-14 13:46:45 -06:00
Aditya Kulkarni
91943766d3 Refactor salt key tests to be raet compatible 2014-07-14 15:22:38 -04:00
Mike Place
a08849c270 Remove old-style env= tests. 2014-07-14 11:03:03 -06:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
Pedro Algarvio
7862600683 Remove syslog-ng tests. Refs #14163 2014-07-13 00:09:45 +01:00
Thomas S Hatch
7e54d0fa20 Revert "lxc refactor" 2014-07-12 11:38:03 -06:00
Pedro Algarvio
1772b40ecd Merge pull request #14139 from rallytime/batch_test 
A couple of batch unit tests
 2014-07-12 00:06:40 +01:00
rallytime
010f942dc8 Pylint fix, again. 2014-07-11 16:02:06 -06:00
Thomas S Hatch
1e5a545c8c Merge pull request #14137 from mgwilliams/lxc 
lxc refactor
 2014-07-11 16:00:06 -06:00
rallytime
2523d8c641 Mock LocalClient in batch unit tests 2014-07-11 15:38:34 -06:00
Thomas S Hatch
da2f3543fd Skip gitfs tests 
These are running in an incosistent way, all of our local tests pass
 2014-07-11 15:17:58 -06:00
rallytime
c61a1eeb20 Pylint fix 2014-07-11 14:09:24 -06:00
rallytime
2783249931 Remove line 2014-07-11 13:55:56 -06:00
rallytime
bc155127a3 A couple of batch unit tests 2014-07-11 13:54:35 -06:00
Matthew Williams
71e1522c08 WIP: continue restructure of modules.lxc 2014-07-11 19:17:55 +00:00
Matthew Williams
3a0263d551 WIP: lxc restructure 2014-07-11 18:28:37 +00:00
Thomas S Hatch
2ca17d451a me english so fail 2014-07-10 16:11:00 -06:00
Thomas S Hatch
d2eaad22eb Merge pull request #14100 from cachedout/test_exit 
Clean keyboard exit in test suite
 2014-07-10 14:39:14 -06:00
Thomas S Hatch
e5fe94227f Merge pull request #14097 from mgwilliams/lxc 
add lxc integration tests
 2014-07-10 13:31:17 -06:00
Mike Place
12f851ec3a Clean keyboard exit in test suite 2014-07-10 12:52:43 -06:00
Matthew Williams
e102a95b84 use a faster template (sshd) for lxc integration tests 2014-07-10 14:38:28 -04:00
Matthew Williams
298d4e6eac add lxc integration tests 2014-07-10 13:37:48 -04:00
Thomas S Hatch
9bcadf3c9a Merge pull request #14033 from ihrwein/add-syslog-ng-module 
Add syslog-ng state and execution module
 2014-07-10 10:09:37 -06:00
Thomas S Hatch
af5f42a370 Merge pull request #14069 from rallytime/batch_test 
Simple integration test for batch cli command
 2014-07-10 10:06:19 -06:00
rallytime
0000859eb1 pylint fix 2014-07-09 22:31:54 -06:00
rallytime
9eae34c935 Merge branch 'batch_test' of https://github.com/rallytime/salt into batch_test 2014-07-09 22:01:21 -06:00
rallytime
1acf3ac3a9 Fix batch test 2014-07-09 22:00:41 -06:00
Pedro Algarvio
77aeefe261 Fix dest value 2014-07-10 00:41:26 +01:00
Pedro Algarvio
29fae98470 Merge pull request #14072 from terminalmage/refine-gitfs-tests 
Refine gitfs tests
 2014-07-10 00:02:28 +01:00
rallytime
1df0c20d97 Pyling fixes 2014-07-09 16:22:00 -06:00
Erik Johnson
1fd16fa434 Refine gitfs tests 
This adds a tearDown to ensure a clean copy of the repo for each test.
In addition, it removes the dependency on lexicographical order by
running a find_file() inside the two tests which require it in order to
ensure that the file exists in the gitfs cache.
 2014-07-09 16:06:36 -06:00
rallytime
56279770a9 Simple integration test to execute a batch command to help catch regressions 2014-07-09 15:41:18 -06:00
rallytime
e8fde1b125 Add cli option for batch tests to runtests.py 2014-07-09 15:16:13 -06:00
btibi
851ce0fde4 Add syslog_ng execution module. 2014-07-09 22:42:36 +02:00
btibi
f69977d3e5 Add syslog_ng state module. 2014-07-09 22:04:13 +02:00
Thomas S Hatch
ccb4f1e1e8 Merge pull request #14059 from rallytime/schedule_tests 
One more unit test for utils.schedule
 2014-07-09 12:45:05 -06:00
rallytime
c5c841750a Raise ValueError instead of returning in utils.schedule.eval 2014-07-09 11:59:31 -06:00
btibi
9eeed00382 ps: add partial psutil 2.0 compatibility 2014-07-09 19:54:25 +02:00
Thomas S Hatch
a852b87ff9 Merge pull request #14054 from pass-by-value/raet_test_full_returns_test 
Make sure test_full_returns passes for RAET
 2014-07-09 11:18:21 -06:00
Aditya Kulkarni
b9571b61c7 Make sure test_full_returns passes for RAET 2014-07-09 09:32:50 -06:00
Thomas S Hatch
946d54ebe4 Merge pull request #14037 from rallytime/schedule_tests 
Fix KeyError in schedule.delete and more schedule unit tests
 2014-07-08 20:09:37 -06:00
Thomas S Hatch
37a14bf37c Merge pull request #14039 from terminalmage/fix-gitfs-tests 
Fix gitfs tests
 2014-07-08 20:05:01 -06:00
Erik Johnson
d942c98ef6 Fix gitfs tests 
This changes how the setUp function initializes and commits the repo
used as a gitfs remote by these tests. Instead of using the git.Git
class, it simply uses the index object to add and then commit. See here
for more info:

https://pythonhosted.org/GitPython/0.3.1/tutorial.html#the-index-object

Additionally, file_hash() and serve_file() are designed to check copies
of files that have been retrieved from the blobs, in
$cachedir/gitfs/refs/$saltenv/path/to/file. The paths have been fixed in
these two tests, and the sha1 test has been renamed to ensure that it is
executed after test_find_file, so that the file exists in the cache.
 2014-07-08 18:56:12 -06:00
Aditya Kulkarni
edfabad5e2 Skip tests if no internet connection 2014-07-08 17:16:47 -06:00
rallytime
7942350a65 Fix where=None bug 2014-07-08 16:58:19 -06:00
rallytime
0a7b58652b Fix potential KeyError in schedule.delete and more unit tests 2014-07-08 15:54:30 -06:00
Thomas S Hatch
b7a6200708 Merge pull request #14027 from pass-by-value/ext_pillar_12647 
Make sure multiple git pillar sources work
 2014-07-08 13:41:38 -06:00
Thomas S Hatch
ba90c0b22e Merge pull request #14030 from rallytime/schedule_tests 
More scheduler unit tests and fixed keyerror possibility
 2014-07-08 12:27:23 -06:00
Thomas S Hatch
f0724b3b41 Use salt.utils.process.clean_proc instead of the one in master.py 
We need to clean up the master.py clean_proc so we only use one
 2014-07-08 12:18:24 -06:00
rallytime
a3c1d0e320 A few more tests for enabling and disabling jobs 2014-07-08 12:00:08 -06:00
rallytime
5ad8bb8f01 Update test docstrings 2014-07-08 11:38:16 -06:00