20 Commits

Author	SHA1	Message	Date
Seth House	e47fe835c9	Remove mocks from rest_cherrypy integration tests ... These mocks predated the inclusion of salt-api into Salt core. They are now no longer needed and counter-productive.	2015-09-09 10:39:35 -06:00
Seth House	6d22514934	Rename the rest_cherrypy tests to conform to our convention ... Previously they conformed to the default unittest2 convention.	2015-09-09 10:39:34 -06:00
Colton Myers	befb666623	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/modules/mongodb.py salt/utils/http.py salt/utils/process.py tests/integration/__init__.py	2015-04-27 10:28:53 -06:00
rallytime	8d5b50e17c	Don't forget the blank lines at the end of the file	2015-04-24 16:29:51 -06:00
rallytime	9830708f86	Some small test clean up changes	2015-04-24 16:27:22 -06:00
Pedro Algarvio	60f215f191	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
Pedro Algarvio	e45033b993	Make PyLint ignore unused imports	2014-11-20 16:40:47 +00:00
Pedro Algarvio	6b19c7b03e	Use urlencode from six	2014-11-20 16:40:45 +00:00
Pedro Algarvio	5e4eb4bbaf	Don't add tests in __init__	2014-10-08 01:02:10 +01:00
Seth House	2b5bed43b9	Add integration test for logging out of the rest_cherrypy app	2014-08-15 09:45:30 -04:00
Seth House	63be4efae9	Added basic smoke-tests for the rest_cherrypy /run entrypoint	2014-07-14 22:11:20 -06:00
Seth House	2dad062f8a	Move rest_cherrypy mocked methods into individual tests	2014-07-14 20:18:21 -06:00
Pedro Algarvio	db58cbd8ca	Ignore import	2014-06-30 01:03:36 +01:00
Seth House	f18a636628	Raise a 401 reponse instead of redirecting to the login page ... Also fixed bad tests that should have caught this. Fixes saltstack/salt-api#155.	2014-06-27 14:03:34 -06: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
Pedro Algarvio	7590586d05	Don't fail on missing CherryPy	2014-06-19 13:00:38 +01:00
Seth House	d526c9ec2b	Mock fire_event() in test to check auth setting	2014-06-18 16:52:14 -06:00
Seth House	d24cf41b62	Added integration tests for webhook auth enable/disable	2014-04-08 13:51:33 -06:00
Seth House	0a1a21df17	First stab at integration tests for the rest_cherrypy netapi module	2014-03-31 09:58:56 -06:00