Commit Graph

30 Commits

Author SHA1 Message Date
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
Colton Myers
cc8785e980 Fix the test.fib tests 2015-04-11 14:48:59 -04:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Pedro Algarvio
5dfddc88a4 Switch open() for salt.utils.fopen() 2014-11-26 17:39:49 +00:00
Thomas Jackson
aabe6460f6 Misc comment cleanup in tests 2014-10-28 08:12:10 -07:00
Pedro Algarvio
8e93faa072 Fix lint errors 2014-10-08 01:02:11 +01:00
Pedro Algarvio
dee2c91fde Test the runner client under tests/integration/clients 2014-10-08 01:00:20 +01:00
Thomas Jackson
d9fdc06742 Ensure that timeout will happen for jobs that don't target any alive minions
Instead of checking if all returns are in, we should check that the job is not running anywhere then enforce the per-minion timeout. I've added a test case for the instance where there is a job fired to a minion that will never return (before it would stall forever)
2014-09-30 10:11:55 -07:00
Thomas Jackson
98af66bbf3 Add a regression test for #16240 2014-09-29 16:37:53 -07:00
Aditya Kulkarni
b9571b61c7 Make sure test_full_returns passes for RAET 2014-07-09 09:32:50 -06:00
Pedro Algarvio
0144b24a24 Update test case to new return format.
Also, the comparison check is old, new or better, known -> unknown
2014-03-24 17:07:50 +00:00
Pedro Algarvio
d02a2bc224 Include the python encoding file header on tests. 2013-11-27 11:19:24 +00:00
Thomas Jackson
01f2d119b1 Covering case where kwarg cannot be un-yaml'd
In the past the master has been taking the kwargs passed in and converting them to a string (kwy=value) and letting the minion de-yaml that arg string. In general this is okay, but it doesn't work well if you are calling from the python LocalClient interface-- since the kwarg you passed already had a type. With this change instead of converting the kwarg to a string it is converted to a dict with a flag to mark it as a kwarg dict, then it is unpacked on the minion side while still maintining type
2013-11-05 19:04:23 -08:00
Pedro Algarvio
4a18003231 Error signatures changed, lets update test cases. 2013-09-24 22:08:08 +01:00
Pedro Algarvio
7aed6aeb30 Actually, the Syndic config test case can be a simple unit test. 2013-07-17 16:43:18 +01:00
Pedro Algarvio
e467b1e00b Simplify the Syndic configuration testing.
* Inherit the master configuration file on the syndic one.
* Recreate the Syndic on the test. Don't pass it as a module global.
2013-07-17 16:22:18 +01:00
Mathieu Le Marec - Pasquet
cff1fa6f53 fix/feat: let the syndic be way more configurable
- Fix micmac between configs
- Add options to configure pidfile, logfile, masterofmaster port

This fixes #6024.
2013-07-15 20:30:26 +00:00
Pedro Algarvio
b53da85646 Updated integration.client.syndic test suite to use salttesting.helpers.ensure_in_syspath() 2013-06-28 00:12:59 +01:00
Pedro Algarvio
f02494002b Updated integration.client.standard test suite to use salttesting.helpers.ensure_in_syspath() 2013-06-28 00:12:59 +01:00
Pedro Algarvio
7945cbcd6e Updated integration.client.kwarg to use salttesting.helpers.ensure_in_syspath() 2013-06-28 00:12:59 +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
Tris Forster
714acc50d3 Add success flag to LocalClient.get_full_return() 2013-06-06 10:09:15 +10:00
Dan Colish
f5c8e242e4 Refactor runtests to allow dotted path module discovery.
In addition to traditional file system path test discovery it is
useful to run a test by stating it's dotted python path. For example,
this will only run the cmdmod integration tests from the
module suite::

        $ runtests.py -n tests.integration.modules.cmdmod
2012-05-29 19:56:47 -07:00
Thomas S Hatch
7247c5afe7 Fix test error due to fix in static calls 2012-05-27 21:43:35 -06:00
Baiju Muthukadan
cb5e3ea089 Add testrunner boilerplate code to run tests 2012-05-05 19:39:23 +05:30
Thomas S Hatch
4f3fbe0991 remove unused import 2012-04-21 17:02:18 -06:00
Thomas S Hatch
42ee187943 Add client kwarg tests 2012-04-03 22:30:38 -06:00
Thomas S Hatch
ea7e9d2ff5 move syndic to client tests 2012-04-03 21:59:38 -06:00
Thomas S Hatch
e43f213b8f Add first client api tests 2012-04-03 21:57:41 -06:00