rallytime
8d3957f250
Merge branch 'carbon' into 'develop'
...
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/boto_ec2.py
- salt/modules/cmdmod.py
- salt/modules/win_lgpo.py
2016-10-28 11:58:41 -06:00
rallytime
e4dc059959
Update Carbon versionadded tags to 2016.11.0 in tests/*
2016-10-27 10:04:13 -06:00
rallytime
fb994ad92f
Merge branch 'carbon' into 'develop'
...
No conflicts.
2016-09-14 09:00:05 -06:00
Erik Johnson
fd28ca058f
Fix for new integration test for fileserver.clear_file_list_cache
...
The test suite actually has a ``prod`` env, but this test only considers
the ``base`` env. If a test is run which requests a file (or just the
file/dir/symlink/... list) from the ``prod`` env, then this will result
in the ``prod`` env's file list caches being present, and they will be
removed when the ``fileserver.clear_file_list_cache`` runner is
executed, showing up in the return data and causing the test to fail.
This tweak to the test ensures that we will always have a file list
cache for ``prod`` present, and adjusts the necessary asserts in the
test to expect the ``prod`` env in the return data from the runner.
2016-09-13 15:55:51 -05:00
rallytime
e385f55588
Merge branch 'carbon' into 'develop'
...
No conflicts.
2016-09-13 08:25:11 -06:00
Erik Johnson
b7a1a67828
Improve accuracy of fileserver runner tests
...
The tests that return files, symlinks, directories, and empty dirs were
all only testing that the type of the return data was the same as what
was expected. By not testing the content, we overlooked a corner case in
which backends passed into the fileserver as a Python list would not be
handled properly. This has since been fixed in PR #36244 , but these
tests will help keep this sort of issue from regressing.
2016-09-12 16:29:10 -05:00
Erik Johnson
322047a844
Add integration tests for fileserver.clear_file_list_cache
2016-09-12 16:29:10 -05:00
rallytime
2edfef33ae
Merge branch 'carbon' into 'develop'
...
Conflicts:
- salt/scripts.py
- salt/thorium/key.py
- tests/unit/cloud/clouds/dimensiondata_test.py
- tests/unit/cloud/clouds/gce_test.py
2016-09-08 17:31:29 -06:00
Ch3LL
ee398a94b6
fix pylint
2016-09-07 10:05:44 -06:00
Mike Place
dfcc14ad45
A more liberal search minion strings in manage test
...
Correct falures where the formatting is slightly different.
2016-09-07 12:37:29 +09:00
Ch3LL
4afc82ac63
add salt-run state.event test
2016-09-06 15:16:16 -06:00
Erik Johnson
9ae753f6ed
Use self.run_run instead of self.run_run_plus
...
Using a salt.runner.Runner() instance to run this test has exposed a
problem with run_run_plus, where the fileclient doesn't behave as
expected. Since the raw return data is not needed, using run_run here
lets the test pass while we continue to work on run_run_plus.
2016-09-03 14:59:04 -05:00
Erik Johnson
ab9a89d6dc
Add test for jid in runner ret events (zh 858)
2016-09-03 14:59:04 -05:00
Erik Johnson
92d6d4ab75
Fix incorrect key for return data
...
The return data from run_run_plus previously returned the runner return
in the ``fun`` key. This has since been corrected. This commit replaces
these references to the ``fun`` key with the corrected ``return`` key.
2016-09-03 14:59:04 -05:00
Erik Johnson
5673395f0c
Update usage of run_run_plus to remove unused "options" argument
2016-09-03 14:59:04 -05:00
Erik Johnson
230c684d4c
Add test case for runner returns
2016-09-03 14:59:04 -05:00
Dmitry Kuzmenko
b412e7814a
Fixed salt-run integration tests.
2016-08-02 10:01:01 +03:00
Aditya Kulkarni
34135e1f67
Add runner for execution modules ( #33949 )
...
* Add runner for execution modules
* Make sure all modules load and fix argument passing
* Fix lint error
* Add docs for salt runner
2016-06-13 11:49:26 -04:00
Dmitry Kuzmenko
17b03e9d8b
Allow to blacklist/whitelist renderers. ( #33358 )
...
* Allow to blacklist/whitelist renderers.
* Fix tests.
* Unit test for renderer blacklisting.
* Minor tests fixes
2016-05-20 10:41:51 -07:00
rallytime
28763be519
Remove unused import
2016-02-19 09:51:18 -07:00
rallytime
9b52e39e90
Add testcase for state.orchestrate output
2016-02-19 09:14:46 -07:00
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
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
