Commit Graph

22 Commits

Author SHA1 Message Date
Erik Johnson
b7cc420e6f decode to string before trying to load JSON 2017-05-16 14:20:05 -05:00
rallytime
d4e42b8e74 Use cptc.BaseRestCherryPyTest as test class 2017-05-11 09:09:40 -06:00
rallytime
12a75c1108 Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-05-10 15:32:23 -06:00
Pedro Algarvio
80b80e5416
Fix cherrypy memory leakage
* Clean its event/signal bus since our tests don't rely on those.
* No test class level dictionaries
2017-04-28 13:33:35 +01:00
Erik Johnson
1cdf5ea737 PY3 compatibility fixes to netapi tests 2017-03-22 16:09:56 -05:00
Pedro Algarvio
1daa2e24cd
Moved some test supporting modules to tests/support
Previously they were in tests/utils which also had test case modules.
2017-02-28 22:52:48 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest. 2017-02-23 23:19:42 +00: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
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
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