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 |
|
Justin Findlay
|
6b6280442c
|
disable intermittently failing tests
This commit is to be reverted when #23623 is merged.
|
2015-05-28 16:23:57 -06:00 |
|
Pedro Algarvio
|
60f215f191
|
Add from __future__ import absolute_import
|
2015-01-30 22:25:04 +00:00 |
|
Thomas Jackson
|
05f0969ee8
|
Fix the output now that we are using the default output (nested) instead of hard coding it to yaml
|
2014-04-19 15:59:13 -07:00 |
|
Pedro Algarvio
|
7acf994c46
|
Remove unused imports
|
2014-02-08 07:47:17 +00:00 |
|
Pedro Algarvio
|
d02a2bc224
|
Include the python encoding file header on tests.
|
2013-11-27 11:19:24 +00:00 |
|
Pedro Algarvio
|
16451948a8
|
Updated integration.runners.jobs test suite to use salttesting.helpers.ensure_in_syspath()
|
2013-06-28 00:13:01 +01:00 |
|
Pedro Algarvio
|
222be7b446
|
Make sure every test module is runnable by __main__.
* Double to single quotes
|
2013-06-28 00:12:56 +01:00 |
|
Pedro Algarvio
|
0cad15e299
|
Fix integration.runners.jobs tests.
|
2012-11-04 10:22:18 +00:00 |
|
Seth House
|
6c103bc4df
|
Changed lookup_jid runner to return empty dict instead of an exception
|
2012-10-09 13:55:54 -06:00 |
|
Thomas S Hatch
|
a556a44707
|
fix jobs runner test for new exception return
|
2012-10-07 10:20:03 -06:00 |
|
Thomas S Hatch
|
bd041c31f6
|
sp
|
2012-10-06 23:39:25 -06:00 |
|
Thomas S Hatch
|
af03feecee
|
Update jobs runner to check for valid exception type
|
2012-10-06 23:30:11 -06:00 |
|
Thomas S Hatch
|
fa2c84317d
|
update to new bad jid return data
|
2012-10-06 23:01:34 -06:00 |
|
Jeroen Dekkers
|
a28272e2fb
|
Fix "undefined name" errors spotted by pyflakes
|
2012-07-15 03:01:35 +02:00 |
|
Thomas S Hatch
|
0020706067
|
Add jobs jobs.list_jobs runner test
|
2012-05-27 21:34:48 -06:00 |
|
Thomas S Hatch
|
e5b5d458c3
|
Add tests for jobs runner
|
2012-05-27 21:24:45 -06:00 |
|