rallytime
|
3273bbdab7
|
Merge branch '2017.7' into '2018.3'
Conflicts:
- doc/ref/configuration/master.rst
- doc/ref/modules/all/index.rst
- doc/topics/grains/index.rst
- doc/topics/releases/2016.3.4.rst
- doc/topics/spm/spm_formula.rst
- doc/topics/tutorials/cron.rst
- doc/topics/tutorials/index.rst
- doc/topics/tutorials/stormpath.rst
- salt/engines/slack.py
- salt/log/handlers/fluent_mod.py
- salt/modules/cyg.py
- salt/modules/junos.py
- salt/modules/namecheap_dns.py
- salt/modules/namecheap_domains.py
- salt/modules/namecheap_ns.py
- salt/modules/namecheap_ssl.py
- salt/modules/namecheap_users.py
- salt/modules/reg.py
- salt/modules/tomcat.py
- salt/modules/vault.py
- salt/modules/win_file.py
- salt/modules/zpool.py
- salt/output/highstate.py
- salt/renderers/pass.py
- salt/runners/cache.py
- salt/states/boto_apigateway.py
- salt/states/boto_iam.py
- salt/states/boto_route53.py
- salt/states/msteams.py
- salt/states/reg.py
- salt/states/win_iis.py
- tests/integration/modules/test_cmdmod.py
- tests/integration/states/test_user.py
- tests/support/helpers.py
- tests/unit/cloud/clouds/test_openstack.py
- tests/unit/fileserver/test_gitfs.py
- tests/unit/modules/test_junos.py
- tests/unit/pillar/test_git.py
- tests/unit/states/test_win_path.py
- tests/unit/test_pillar.py
- tests/unit/utils/test_format_call.py
- tests/unit/utils/test_utils.py
- tests/unit/utils/test_warnings.py
|
2018-06-01 14:54:12 -04:00 |
|
Erik Johnson
|
93ee5ee2b0
|
Fix all Sphinx warnings
Well, all but one, which we expect to see
|
2018-05-31 15:28:25 -05:00 |
|
Erik Johnson
|
d612bd27e4
|
Move/merge more test modules
This moves mislocated tests to their proper locations to match the files
they test, merging tests into existing modules where necessary.
|
2018-05-10 14:53:52 -05:00 |
|
Erik Johnson
|
685bfbbd3e
|
[PY3] Add unicode_literals to cache and cli modules
|
2018-01-13 21:08:51 -06:00 |
|
rallytime
|
52edbffc85
|
Merge branch '2016.11' into 'develop'
Conflicts:
- doc/ref/cache/all/index.rst
- doc/topics/cache/index.rst
- salt/cache/localfs.py
- salt/modules/boto_rds.py
- salt/roster/cloud.py
- salt/states/virtualenv_mod.py
- tests/integration/states/test_archive.py
- tests/unit/modules/test_dockermod.py
- tests/unit/states/dockerng_test.py
|
2017-03-28 17:09:30 -06:00 |
|
Pablo Suárez Hernández
|
9174e6f281
|
Fixes testing opts dict for batch unit tests
|
2017-03-24 17:22:57 +00:00 |
|
Pedro Algarvio
|
3beb3fb801
|
Move whatever we need from salttesting to salt.
Let's drop the salttesting dependency cycle.
|
2017-02-28 22:52:49 +00:00 |
|
Pedro Algarvio
|
5fb0aa5dcf
|
Code cleanup
|
2017-02-24 00:49:31 +00:00 |
|
Pedro Algarvio
|
15af4c9728
|
Test filenames conformity. Adjust for pytest.
|
2017-02-23 23:19:42 +00:00 |
|
Colton Myers
|
000de95974
|
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
|
2015-04-16 12:15:44 -06:00 |
|
Thomas Jackson
|
5d8a4d7ab7
|
Add timeout to batch tests
|
2015-04-06 16:46:44 -07:00 |
|
Erik Johnson
|
94d55889d7
|
Resolve merge conflicts
|
2015-02-28 12:35:25 -06:00 |
|
rallytime
|
b01196e7e8
|
Add transport key to mocked opts to fix batch unit tests
|
2015-02-27 14:53:58 -07:00 |
|
Pedro Algarvio
|
60f215f191
|
Add from __future__ import absolute_import
|
2015-01-30 22:25:04 +00:00 |
|
Bahadır Kandemir
|
713e168fc2
|
Add option to mock test.
|
2014-10-21 18:08:21 +03:00 |
|
Pedro Algarvio
|
239b2480ae
|
Skip tests if real mock library is not available
|
2014-08-08 00:46:21 +01:00 |
|
rallytime
|
010f942dc8
|
Pylint fix, again.
|
2014-07-11 16:02:06 -06:00 |
|
rallytime
|
2523d8c641
|
Mock LocalClient in batch unit tests
|
2014-07-11 15:38:34 -06:00 |
|
rallytime
|
c61a1eeb20
|
Pylint fix
|
2014-07-11 14:09:24 -06:00 |
|
rallytime
|
2783249931
|
Remove line
|
2014-07-11 13:55:56 -06:00 |
|
rallytime
|
bc155127a3
|
A couple of batch unit tests
|
2014-07-11 13:54:35 -06:00 |
|