rallytime
bd58650af2
Merge branch '2016.3' into 'carbon'
...
Conflicts:
- tests/unit/netapi/rest_tornado/test_handlers.py
- tests/utils/__init__.py
2016-10-25 10:39:02 -06:00
Mike Place
0bbf06bd86
Lint fix
2016-10-25 16:53:18 +09:00
Mike Place
f609917760
Workaround for utils
2016-10-25 16:51:30 +09:00
Mike Place
2593963f45
Check for attr before attempting to add in salt.tests.utils
2016-08-22 22:13:29 +09:00
rallytime
eb6773823b
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/modules/rh_service.py
2016-04-01 10:33:44 -06:00
rallytime
e9abd2d420
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- salt/modules/rh_service.py
2016-03-28 10:51:23 -06:00
root
4c1ab082b6
add pam salt-api tests
2016-03-14 19:19:06 +00:00
Mike Place
52f6887124
Lint
2016-02-11 13:52:59 -07:00
LoveIsGrief
7965eaab3c
Attempt to fix more pylint errors and warnings
...
Related to saltstack/salt#27089 Saltcloud virtualbox provider
2016-02-11 16:58:57 +01:00
LoveIsGrief
4eab39e9ca
Attempt to fix pylint errors and warnings
...
Related to saltstack/salt#27089 Saltcloud virtualbox provider
2016-02-11 13:56:38 +01:00
LoveIsGrief
66114293bf
Introduce timeout helper
...
This should help us stop copy-pasting the calculations to let us timeout functions
Related to saltstack/salt#27089 Saltcloud virtualbox provider
2016-02-10 21:39:36 +01:00
Ronald van Zantvoort
d04c66d827
Ignore PyLint for external ipaddress module
2015-04-15 15:47:36 +02:00
Ronald van Zantvoort
64bda95d12
Addition of Python 3 compatible ipaddress module
...
https://bitbucket.org/kwi/py2-ipaddress/
2015-04-15 02:37:11 +02:00
Pedro Algarvio
46add23cc1
Py3 compatibility fixes
2015-01-30 22:25:10 +00:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
rallytime
868a6e5459
Change expectedFailures to @skipIfs
2014-10-07 08:13:09 -06:00
rallytime
116c29b135
Fix unittest.case import
2014-10-06 21:24:46 -06:00
Omer Katz
f07d1bf9f2
Fixed some lint errors.
2014-10-02 14:26:39 +03:00
Omer Katz
a8c6288196
Added the ability to create/delete/check for existence of network acl. Tests will fail correctly since moto doesn't support faking network acls yet.
2014-10-02 14:26:38 +03:00
Chris Rebert
177c168a21
Fix numerous typos found via Lintian
...
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
2014-08-11 10:46:43 -07:00
Seth House
2dad062f8a
Move rest_cherrypy mocked methods into individual tests
2014-07-14 20:18:21 -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
Pedro Algarvio
df80f4facb
Under Py2.6 we need unittest2 to be able to access assertRaisesRegexp
2014-06-20 14:26:24 +01:00
Thomas S Hatch
d52ad3a99a
Lint
2014-06-19 22:21:16 -06:00
Seth House
d00cd104ac
And yet more pylint fixes
2014-06-19 17:25:56 -06:00
Pedro Algarvio
c0ffb0814a
Make the NetAPI tests skip if CherryPy is not installed
2014-06-19 12:59:23 +01:00
Seth House
1d4057fadf
Updated all saltapi import paths to salt.netapi
2014-06-18 20:56:16 -06:00
Seth House
b488afe042
Renamed APIClient to NetapiClient to avoid ambiguity
...
Renaming pre-merge to avoid post-merge ambiguity with the unfortunately
named salt.client.api.APIClient(). Sometime in the future netapi modules
are likely to be rewritten to use salt.client.api.APIClient() instead.
2014-06-18 19:40:51 -06:00
Seth House
bbd8e1a856
Add mock for replacing get_event() in tests where needed
2014-06-18 16:51:51 -06:00
Seth House
918fae0cff
Allow individual tests to override Salt opts
2014-04-08 13:51:00 -06:00
Seth House
a79253d05d
Mock auth.LoadAuth for running tests
...
Added mock for the revert in f0cb9d1.
2014-04-04 11:45:38 -07:00
Seth House
bb9ff7aa6a
First stab at unit tests for the various rest_cherrypy tool functions
2014-03-31 09:59:55 -06:00
Seth House
0a1a21df17
First stab at integration tests for the rest_cherrypy netapi module
2014-03-31 09:58:56 -06:00
Seth House
0abda80f08
Return both the request and response objects
...
Since we're so rarely dealing with handlers that output strings in the
rest_cherrypy app it's useful to be able to see the full request object.
2014-03-31 09:00:40 -06:00
Seth House
249132ab24
Moved overriding headers below the content-length check
...
This allows tests to override the automatic content-length in order to
test bad/incorrect content-length headers.
2014-03-31 08:07:32 -06:00
Seth House
055145e797
Renamed 'data' param to 'body'; added 'qs' param
...
Rather than infer things about the request base on args/kwargs, make
both the body of the request as well as any querystring explicit
parameters.
2014-03-31 08:07:32 -06:00
Seth House
06d783c9da
Added note about local modifications to BaseCherryPyTestCase
2014-03-31 08:07:32 -06:00
Seth House
db6444912a
Added utils dir and a helper for testing CherryPy apps
2014-03-29 23:20:29 -06:00
