Commit Graph

38 Commits

Author SHA1 Message Date
Erik Johnson
73537300cb Lint fixes 2015-08-21 13:48:55 -05:00
Erik Johnson
e7099af0f6 Get rid of useless unit tests and add integration test for winrepo 2015-08-21 13:14:42 -05:00
Mike Place
dab4eccd00 Remove overstate tests 2015-06-17 11:14:19 -06:00
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
Erik Johnson
d25677e954 Merge branch '2015.2' into 2015.2-develop 2015-03-10 17:47:30 -05:00
Erik Johnson
d71e9de859 Fix test_envs fileserver runner test
The change in runner output behavior caused the output of test_envs to
change, causing some changes to need to be made in da163471 to get them
to pass. Now that runner output is fixed, the test was returning the
output it should have been in the first place. This commit changes that
test back so that it now expects a list as output.

Additionally, I've taken the opportunity to add additional test calls to
test the "backend" argument for those functions which now have it.
2015-03-10 11:28:59 -05:00
Erik Johnson
94d55889d7 Resolve merge conflicts 2015-02-28 12:35:25 -06:00
C. R. Oldham
1ff3192c20 Fileserver lists return lists 2015-02-27 17:24:25 -07:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Mike Place
da163471af Fix up tests 2014-11-10 15:42:45 -07:00
Arnold Bechtoldt
043c29d518 changing param back to backend in fileserver to improve useability 2014-09-22 08:18:13 +02:00
Arnold Bechtoldt
6b251cbb05 fix integration test in fileserver runner, refs #16008 2014-09-21 21:19:03 +02:00
Arnold Bechtoldt
db5dde72cf extend fileserver runner with additional features 2014-09-21 20:16:41 +02: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
9a22d3053e The pip module no longer accepts __env__ as a kwarg. 2013-11-06 20:15:23 +00:00
David Boucha
1a216bf08c remove commented out code 2013-09-03 11:39:21 -06:00
David Boucha
fa489634a5 check for multiple strings in the test 2013-09-03 11:37:46 -06:00
David Boucha
6fd2146239 split those strings on their path 2013-09-03 00:53:10 -06:00
Pedro Algarvio
2aa572dda6 Updated integration.runners.state test suite to use salttesting.helpers.ensure_in_syspath() 2013-06-28 00:13:01 +01:00
Pedro Algarvio
7747ef4f1b Updated integration.runners.manage test suite to use salttesting.helpers.ensure_in_syspath() 2013-06-28 00:13:01 +01: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
Thomas S Hatch
2218dd95a5 Add parse req failure state 2013-06-10 23:00:48 -06:00
Thomas S Hatch
9752b21343 Add tests for overstate requisites 2013-06-10 18:42:54 -06: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
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
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
Thomas S Hatch
a19ffae25f Add tests for the manage runner 2012-05-27 21:02:29 -06:00