salt/tests/unit
Colton Myers 06e1a4f519 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop2
Conflicts:
	salt/client/mixins.py
	salt/loader.py
	salt/modules/localemod.py
	salt/modules/pillar.py
	salt/netapi/rest_cherrypy/app.py
	salt/pillar/__init__.py
	salt/states/mount.py
	salt/states/ssh_auth.py
2015-02-06 12:09:01 -07:00
..
cli Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
modules Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop2 2015-02-06 12:09:01 -07:00
netapi Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
output Remove test as well 2015-02-05 09:20:29 -08:00
pillar Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
renderers Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
returners Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
states Typo 2015-02-06 10:46:31 -07:00
templates Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
utils Clean up some pylint on 2015.2 2015-02-06 07:58:26 -07:00
__init__.py First stab at unit tests for the various rest_cherrypy tool functions 2014-03-31 09:59:55 -06:00
auth_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
client_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
config_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
files_test.py Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
highstateconf_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
log_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
minion_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
overstate_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
payload_test.py Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
pillar_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
pydsl_test.py Options should not be globally defined. Do the right thing. 2015-01-30 22:27:15 +00:00
pyobjects_test.py Update documentation & tests following #18911 2015-02-04 21:27:24 -08:00
simple.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
stateconf_test.py Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
template_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
version_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00