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
37,709 Commits 24 Branches 182 Tags 341 MiB
2ed1957427
Commit Graph

1096 Commits

Author SHA1 Message Date
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
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
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
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
Seth House
ac6c7d0d6d Added utils-style IP-check functions to the network module 2014-07-25 15:20:14 -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
Rob Messick
4549ef25a2 Add support for pre_releases argument to the gem state 2014-07-25 12:30:42 -07:00
Seth House
0d8cc41c61 Added tests for calling functions via Jinja with dot-lookup syntax 
Yay!
 2014-07-25 12:27:45 -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
Rob Messick
74cf92331b add optional pre_releases argument to gem.install 2014-07-24 17:26:27 -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
c70c8ee5aa Remove cloud_config tests for deprecated arguments 2014-07-17 16:41:11 -06: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
rallytime
7bea8f5cb6 Change python asserts to unittest asserts 2014-07-15 11:56:50 -06:00
Leonids Maslovs
6c3973ec05 WIP 13793 Unit tests fixed 2014-07-15 13:19:07 +03:00
Thomas S Hatch
8435329d91 Merge pull request #14209 from cachedout/master_config 
Small refactor
 2014-07-14 16:06:09 -06:00
Mike Place
457a33d633 Fix test errors 2014-07-14 13:46:45 -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
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
rallytime
2523d8c641 Mock LocalClient in batch unit tests 2014-07-11 15:38:34 -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
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
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
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
rallytime
cf11ca22d0 More scheduler unit tests and fixed keyerror possibility 2014-07-08 11:27:32 -06:00
Thomas S Hatch
cec3b71840 Merge pull request #14026 from cachedout/gpg_bin_check 
Check for gpg binary
 2014-07-08 11:01:23 -06:00
Mike Place
7b9c313773 Check for gpg binary 2014-07-08 10:16:05 -06:00
Thomas S Hatch
a3f9e89072 Merge pull request #14012 from rallytime/output_grains_tests 
Test for unicode characters in grains outputter
 2014-07-07 16:48:23 -06:00
Thomas S Hatch
09366515dc Merge pull request #14016 from rallytime/fix_bad_copypaste 
Fix typo in email from bad copy-paste
 2014-07-07 16:16:47 -06:00
rallytime
d5c2a92d24 Fix typo in email from bad copy-paste 2014-07-07 16:12:11 -06:00
rallytime
b4f98fc505 fix email address 2014-07-07 15:44:36 -06:00
rallytime
e1b6a2a9f1 Remove unnecessary line 2014-07-07 15:37:07 -06:00
rallytime
9aceee587c Test for unicode characters in grains outputter 2014-07-07 15:35:10 -06:00
Mike Place
44a06ef7f0 Fix gpg test 2014-07-07 15:26:27 -06:00
rallytime
a7eadd74ff remove unnecessary comment 2014-07-03 15:49:59 -06:00
rallytime
656db75ac0 Started some schedule unit tests 2014-07-03 15:48:46 -06:00
Thomas S Hatch
5f959591c6 Merge pull request #13713 from terminalmage/issue13672 
Allow traversing dicts nested with lists when matching
 2014-06-25 14:40:26 -06:00
Erik Johnson
d726c2f48a Add additonal unit tests for pull request #13713 2014-06-25 11:52:02 -05:00
Matthew Williams
45fadcf885 fix bugs in highstate whitelist, add tests 2014-06-24 17:38:53 -04:00
rallytime
67e65b237d More cloud config unit tests 2014-06-24 10:59:46 -06:00
rallytime
f821ccaa88 More cloud profile config tests 2014-06-23 15:19:11 -06:00
rallytime
d9f53a37f9 One more cloud config unit test 2014-06-23 12:17:26 -06:00
rallytime
d9c9297954 Make cloud configuration unit tests more organized 2014-06-20 15:47:00 -06:00
rallytime
1e83b2012b Unit tests for is_provider_configured function in salt.config.py 2014-06-20 15:29:18 -06:00
Pedro Algarvio
d4c07d6776 Merge pull request #13574 from whiteinge/misc-salt-api-fixes 
Misc salt api fixes
 2014-06-20 01:28:41 +01:00
Pedro Algarvio
15071b460a Merge pull request #13579 from rallytime/cloud_config_unittests 
Unit tests for cloud_config function in salt.config.py
 2014-06-20 00:50:08 +01:00
Seth House
66e2b54f36 Added encoding comment to empty init files 2014-06-19 17:37:44 -06:00
Seth House
d00cd104ac And yet more pylint fixes 2014-06-19 17:25:56 -06:00
rallytime
3a84dd4a3c Unit tests for cloud_config function in salt.config.py 2014-06-19 16:03:59 -06:00
Thomas S Hatch
a46e6f4875 Merge pull request #13383 from s0undt3ch/issues/10404-vt-ptys-not-released 
[DO NOT MERGE] Fix #10404 vt ptys not released
 2014-06-19 14:16:52 -06:00
Pedro Algarvio
f518e1f186 Merge pull request #13564 from rallytime/migrate_cloud_config_tests 
Migrate cloud config tests
 2014-06-19 19:10:17 +01:00
rallytime
8f74282a34 Removed cloud_config_test.py file 2014-06-19 09:24:47 -06:00
rallytime
e53ec01cd4 Transfer cloud_config_test.py tests to config_test.py 2014-06-19 09:20:38 -06:00
Pedro Algarvio
34fcf1da45 Test if we're closing open PTY's 2014-06-19 13:08:50 +01:00
Pedro Algarvio
7590586d05 Don't fail on missing CherryPy 2014-06-19 13:00:38 +01:00
Seth House
53bab586f4 Merged salt-api into Salt 
Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
 2014-06-18 22:13:56 -06:00
Seth House
1d4057fadf Updated all saltapi import paths to salt.netapi 2014-06-18 20:56:16 -06:00
rallytime
636cf892ca Pylint fix 2014-06-18 17:47:05 -06:00
rallytime
c7e3816e54 Unit tests for cloud provider extends functionality 2014-06-18 17:15:15 -06:00
rallytime
914c9ed1fb First rudimentary cloud provider config tests 2014-06-17 15:12:23 -06:00
Pedro Algarvio
9f7ead2e33 Remove unused imports 2014-06-15 13:05:18 +01:00
Pedro Algarvio
c2ab05bc56 Tempdir under integration.SYS_TMP_DIR and use AdaptedConfigurationTestCaseMixIn 2014-06-15 13:05:18 +01:00
Pedro Algarvio
000655d7f4 Use SaltClientTestCaseMixIn instead 2014-06-15 13:05:18 +01:00
Pedro Algarvio
4cbd6c6238 Remove unused imports 2014-06-15 13:05:17 +01:00
Pedro Algarvio
318409a859 Don't remove the root_dir, the tests suite takes care of that 2014-06-15 13:05:17 +01:00
Thomas S Hatch
60ac9b8321 Merge pull request #13433 from ahammond/psql_nopassword 
psql should never prompt for a password
 2014-06-14 07:24:14 -06:00
Thomas S Hatch
396078d1aa Merge pull request #13446 from anylain/add_traverse_dict_and_list 
Add salt.utils.traverse_dict_and_list()
 2014-06-14 07:23:15 -06:00
panying
742607a33f + add test_traverse_dict_and_list 2014-06-14 15:25:02 +08:00
Andrew Hammond
1c6b95b4dc psql should never prompt for a password 
No matter if we have been given a password or not, it never makes sense
for psql to interactively prompt for a password. It's better to fail
immediately than to hang because psql is waiting for input that will
never happen.
 2014-06-13 17:40:11 -07:00
Mathieu Le Marec - Pasquet
a6262beeb3 Fix the broken check state logic 2014-06-13 13:20:14 +02:00
Erik Johnson
0104ccc400 Fix failing jinja unit tests 
These began failing due to a recent change in the error reporting for
undefined jinja variables.
 2014-06-12 14:33:53 -05:00
Pedro Algarvio
0564fc363e A more generic directory name 2014-06-10 03:25:14 +01:00
Pedro Algarvio
9bd6d330ec Change to an existing directory before importing keyring 2014-06-10 01:52:53 +01:00
Pedro Algarvio
9d208eaf76 Use an explicit path for the keydir not getcwd 2014-06-10 01:52:53 +01:00
Pedro Algarvio
a7b7f18e6f Double to single quotes 2014-06-06 12:24:10 +01:00
Pedro Algarvio
c4e47df943 Don't use the hardcoded path 2014-06-05 10:10:55 +01:00
Pedro Algarvio
bebddb9174 Don't use hardcoded paths 2014-06-05 10:10:55 +01:00
Pedro Algarvio
36ea569d0d Don't use hard coded paths 2014-06-05 10:10:55 +01:00
Pedro Algarvio
7e11871d9f Ensure correct syspath 2014-06-01 06:55:52 +01:00
Thomas S Hatch
ba4cc71a14 fix more sls to yamlex refs 2014-05-30 10:14:47 -06:00
Thomas S Hatch
8b3dabbf7d lint 2014-05-30 09:45:46 -06:00
Thomas S Hatch
b8897a5b0d rename the sls renderer to the yamlex renderer 2014-05-30 09:28:20 -06:00
Thomas S Hatch
185eae31cd Merge branch 'serializers-migration' of https://github.com/johnnoone/salt into johnnoone-serializers-migration 
Conflicts:
	salt/pillar/__init__.py
 2014-05-30 09:16:21 -06:00
Thomas S Hatch
84f4fa1430 Merge pull request #13122 from cachedout/test_fixing 
Fix broken tests
 2014-05-30 09:08:53 -06:00
Pedro Algarvio
204ed95c2c PyLint ignore W1111 (assignment-from-none) 2014-05-30 09:38:35 +01:00
Mike Place
11e6ddf33c Fix SMTP test 
Magic or ugly hack? You decide.
 2014-05-29 16:38:59 -06:00
Mike Place
623b01af81 Pylint 2014-05-29 16:13:42 -06:00
Mike Place
0e53190996 Fix broken tests 
Thanks to @rallytime for pointing out that several unit tests
were not working correctly when run locally.

I have fixed the perm_test to no longer use relative paths. I have
also disabled this tests since, at some point at least, perms changed
to be 0664 instead of 0644 in a number of places. This warrents further
discussion.

I have fixed pydsl_test to no longer throw errors to stdout about
missing SLS files. (Yay!!)

I have fixed the smtp_return tests so that it will without errors
on hosts with gnupg installed.
 2014-05-29 15:04:11 -06:00
Michaël Lemaire
7b437abd4f Fixed MagicMock import in postgres_test 2014-05-28 15:14:22 +02:00
Michaël Lemaire
cd0f4adae8 Fixed postgres_group.present always updating on test=True 2014-05-28 15:11:24 +02:00
Michaël Lemaire
07bedfe362 Fixed state postgres_user always updating on test=True 2014-05-28 15:05:50 +02:00
Michaël Lemaire
a4b3ef9a69 Added unit tests for postgres_user.present 2014-05-28 14:58:53 +02:00
Michaël Lemaire
5126f0a8ac states.postgres_extension: Fixed unit test patching (and renamed to PostgresExtensionTestCase for future tests) 2014-05-28 14:58:09 +02:00
Pedro Algarvio
4d7ca91424 Remove unnecessary ©️ and :license: from file headers 2014-05-26 19:26:15 +01:00
David Czarnecki
b8df9af0ff Fix rvm module test for adding cwd argument 2014-05-23 16:38:04 -04:00
Erik Johnson
5e0d10f03c Update event tests to use truncated hash 2014-05-23 08:57:01 -05:00
Erik Johnson
0d35a56772 Ensure this test is run as root 2014-05-22 12:02:44 -05:00
Erik Johnson
4de5050ded Add test for sock path length 2014-05-22 11:59:26 -05:00
Joseph Hall
a0fae7c349 Cleanup whitespace issues for pylint 2014-05-21 19:31:46 -06:00
David Boucha
9dc182a2f4 fix codeauthor misspellings 2014-05-21 18:59:02 -06:00
Erik Johnson
512adb3136 Add test for shadow.gen_password 
This addresses some breakage in this function. For more info, see
https://github.com/saltstack/salt/pull/12941.
 2014-05-21 18:37:07 -05:00
Mike Place
888662692f Pylint zcbuildout 
I see no evidence of this argument in use. Removed and modified test.

Closes #9556
 2014-05-21 10:11:25 -06:00
Pedro Algarvio
5a8575dbb9 The helper method is now released 2014-05-20 10:53:47 +01:00
rallytime
46f90298fb Pylint fixes 2014-05-15 20:05:08 -06:00
rallytime
c9623c7cc2 Unit tests for aliases module 2014-05-15 16:51:44 -06:00
Gareth J. Greenaway
823575c901 Unit tests for file state broke after adding the follow_symlnks argument. Tests were looking for a value in a specific position in a dictionary which has been pushed back one value. Also fixing an issue that happened if the file being managed by the module is a symlink, file would be treated as a new file. 2014-05-14 11:30:28 -07:00
Thomas S Hatch
2ad2739d98 Merge pull request #12680 from tedski/mdadm_refactor 
Refactor mdadm module/state to support all options on create.
 2014-05-12 16:38:56 -06:00
rallytime
0042169b7c Created renderers directory in salt/tests/unit for gpg_test.py 2014-05-12 13:21:26 -06:00
Ted Strzalkowski
71983ab581 another pylint fix 2014-05-11 19:06:09 -07:00