2650 Commits

Author	SHA1	Message	Date
Joe Julian	4a840f39d5	Fix tls test to work against develop branch	2015-06-08 17:36:29 -07:00
Joe Julian	048713747c	Revert "Disable tls tests (for now)" ... This reverts commit 5833a0e535.	2015-06-08 16:29:23 -07:00
Colton Myers	5833a0e535	Disable tls tests (for now)	2015-06-08 15:27:47 -06:00
Colton Myers	9cf402e0a7	Python3 compat	2015-06-05 13:52:35 -06:00
Colton Myers	6d503c12ea	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: doc/ref/modules/all/salt.modules.ipmi.rst doc/ref/modules/all/salt.modules.system_profiler.rst salt/fileclient.py salt/loader.py salt/modules/tls.py salt/modules/win_path.py salt/states/pkg.py salt/utils/event.py salt/utils/pagerduty.py tests/unit/modules/seed_test.py	2015-06-05 13:03:48 -06:00
Colton Myers	c0ff4110ab	Merge pull request #24398 from makinacorpus/aptv ... VirtualName for states.apt	2015-06-05 11:40:04 -06:00
Justin Findlay	36263405be	Merge pull request #24447 from jayeshka/rabbitmq_policy_states-unit-test ... adding states/rabbitmq_policy unit test case.	2015-06-05 09:26:10 -06:00
Jayesh Kariya	9b038abd63	adding states/rabbitmq_policy unit test case.	2015-06-05 17:35:31 +05:30
Jayesh Kariya	cb0c99a012	adding states/rabbitmq_plugin unit test case.	2015-06-05 17:33:49 +05:30
Mathieu Le Marec - Pasquet	785d27707f	VirtualName for states.apt ... This fixes #24397 Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>	2015-06-05 09:45:52 +02:00
Gareth J. Greenaway	c95f8be0ae	Updating unit tests based on changes to module.	2015-06-04 20:33:52 -07:00
Justin	1df4020ec2	Changed mock path to be absolute in test_parse_targets	2015-06-04 11:11:33 -06:00
Justin Findlay	deaee68b89	Merge pull request #24371 from joejulian/2015.5_tls_module_tests ... 2015.5 tls module tests	2015-06-04 09:20:16 -06:00
Justin Findlay	84686ee695	Merge pull request #24403 from jayeshka/process_states-unit-test ... adding states/process unit test case.	2015-06-04 09:19:01 -06:00
Justin Findlay	35de8d72db	Merge pull request #24402 from jayeshka/pyenv_states-unit-test ... adding states/pyenv unit test case.	2015-06-04 09:18:11 -06:00
Justin Findlay	632f838838	Merge pull request #24401 from jayeshka/powerpath-states-unit-test ... adding states/powerpath unit test case.	2015-06-04 09:17:46 -06:00
Jayesh Kariya	5f263ab48b	adding states/pyenc unit test case.	2015-06-04 17:50:04 +05:30
Jayesh Kariya	fcb71fb35e	adding states/process unit test case.	2015-06-04 17:49:04 +05:30
Jayesh Kariya	49ff9272ce	adding states/powerpath unit test case.	2015-06-04 17:47:39 +05:30
Christophe Drevet-Droguet	7b9451451f	module grains tests: test list order preservation	2015-06-04 09:52:09 +02:00
Justin	7570ae9132	Disabled flaky test to review later	2015-06-03 16:27:33 -06:00
Joe Julian	4c5dee1e25	Add @destructiveTest decorator to destructive tests	2015-06-03 15:27:05 -07:00
Colton Myers	baf4337918	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: salt/modules/lxc.py salt/roster/clustershell.py	2015-06-03 13:47:08 -06:00
Colton Myers	d710489794	Merge pull request #24347 from basepi/merge-forward-develop ... Merge forward from 2015.5 to develop	2015-06-03 09:38:49 -06:00
Thomas S Hatch	ae681a4db1	Merge pull request #24313 from nicholascapo/fix-22991-npm.installed-test-true ... Fix #22991 Correctly set result when test=True	2015-06-03 08:49:18 -06:00
Thomas S Hatch	d57a9a267c	Merge pull request #24312 from nicholascapo/fix-18966-file.serialize-test-true ... Fix #18966: file.serialize supports test=True	2015-06-03 08:49:06 -06:00
Joe Julian	274bbd4d43	Accept results from older pyOpenSSL	2015-06-02 18:17:05 -07:00
Joe Julian	161f913522	All cert info should be in UTC always	2015-06-02 18:17:05 -07:00
Joe Julian	9affcca766	See the whole diff if dict compare fails	2015-06-02 18:17:05 -07:00
Joe Julian	94f620857c	Ignore extensions for now. Resolve this as part of fixing issue 24338.	2015-06-02 18:17:04 -07:00
Joe Julian	84904d31f1	Mask lint warning for unused imported module	2015-06-02 18:17:04 -07:00
Joe Julian	5675b78459	Do not test if PyOpenSSL is not installed	2015-06-02 18:17:04 -07:00
Joe Julian	563cc66311	Add tls tests	2015-06-02 18:17:04 -07:00
Nicholas Capo	ac9644cb19	Fix #22991 npm.installed correctly set result on test=True	2015-06-02 18:09:19 -05:00
Colton Myers	288d49e51c	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: salt/modules/ipmi.py	2015-06-02 15:51:50 -06:00
Nicholas Capo	e7328e7043	Fix #18966 file.serialize correctly set result on test=True ... * Use file.check_managed_changes to diff the file when test=True	2015-06-02 15:50:28 -05:00
Christophe Drevet-Droguet	756f5d8716	new set function for module grains, and unit tests	2015-06-02 15:41:26 +02:00
Christophe Drevet-Droguet	8a63d1ebbe	fix state grains silently fails #24319	2015-06-02 13:29:59 +02:00
Christophe Drevet-Droguet	ca1af20203	grains state: add some tests	2015-06-02 13:29:52 +02:00
Thomas S Hatch	ac1134af22	Merge pull request #24188 from aneeshusa/add-sqlite-pillar ... Add sqlite3 pillar	2015-06-01 11:45:15 -06:00
Nicole Thomas	e7542e7a38	Merge pull request #24236 from jdsieci/develop ... RedHat IPv6 static routes	2015-05-30 21:34:24 -06:00
Jerzy Drozdz	2f3d0298af	pylint volation fixes	2015-05-30 02:04:49 +02:00
Colton Myers	5fcbcfe6d5	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: doc/topics/cloud/digitalocean.rst doc/topics/tutorials/index.rst salt/cloud/clouds/digital_ocean.py salt/modules/lxc.py salt/returners/__init__.py	2015-05-29 17:33:28 -06:00
Jerzy Drozdz	9eb9892516	Changed return values and assertions to lists	2015-05-30 01:03:43 +02:00
Thomas S Hatch	a28515aa2c	Merge pull request #23060 from makinacorpus/service ... ubuntu systemd/legacy init support	2015-05-29 17:02:08 -06:00
Colton Myers	75590cf490	Merge pull request #24080 from makinacorpus/lxc_consistency2 ... Lxc consistency2	2015-05-29 16:51:54 -06:00
Jerzy Drozdz	e564a0b473	Added setting of __grains__['osrelease'] in test	2015-05-30 00:16:25 +02:00
Colton Myers	90cb448910	Fix rest of rabbitmq tests	2015-05-29 15:11:25 -06:00
Colton Myers	7736509c6b	Fix rabbitmq test	2015-05-29 15:11:19 -06:00
Colton Myers	c4f5e231fa	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2 ... Conflicts: doc/_themes/saltstack2/layout.html doc/conf.py doc/index.rst doc/ref/modules/all/salt.modules.hipchat.rst doc/topics/releases/index.rst salt/client/ssh/client.py salt/cloud/clouds/vsphere.py salt/modules/boto_dynamodb.py salt/modules/boto_route53.py salt/modules/data.py salt/modules/http.py salt/modules/tls.py salt/output/compact.py salt/states/boto_elb.py salt/states/linux_acl.py salt/states/rabbitmq_user.py salt/states/win_servermanager.py salt/utils/dictupdate.py salt/wheel/config.py	2015-05-29 15:10:13 -06:00