rallytime
b8e4706074
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- salt/modules/saltutil.py
- salt/states/archive.py
2016-06-08 14:26:18 -06:00
Justin Anderson
ebee8a89af
glance.warn_until shouldn't be checked for a doc string
2016-06-02 16:30:36 -06:00
Justin Anderson
ebf1256545
Don't need to check swift.head due to it having no body
2016-05-24 15:26:28 -06:00
Justin Anderson
59e90064e6
modules.swift.head does not have a body. Should not be checked for a docstring right now.
2016-05-24 14:58:32 -06:00
rallytime
7554d0f42d
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- doc/ref/states/include.rst
- doc/topics/cloud/reactor.rst
- doc/topics/reactor/index.rst
- doc/topics/releases/2015.5.10.rst
- doc/topics/tutorials/states_pt5.rst
- doc/topics/windows/windows-package-manager.rst
- salt/config.py
- salt/modules/state.py
- salt/states/grains.py
- tests/integration/modules/sysmod.py
- tests/unit/states/grains_test.py
2016-03-24 15:48:00 -06:00
Erik Johnson
1b97e4a3df
Improve state module docs, replace references to state.highstate/state.sls with state.apply
...
Resolves #32037 .
2016-03-21 22:56:17 -05:00
Michael Steed
83a96367a4
Manual merge of #24414 per thatch45
2015-06-06 07:47:52 -06:00
Colton Myers
1a38b4b834
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cli/salt.py
salt/client/mixins.py
salt/renderers/pyobjects.py
2015-04-22 11:07:01 -06:00
Thomas Jackson
98af7c3f95
Cleanup jinja attribute access for loader
...
Refactor of #22723
2015-04-21 22:39:17 -07: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 S Hatch
f8cdc5060e
fix sysdoc tests for new module level hooks
2015-04-15 19:42:23 -06:00
Erik Johnson
0a077c14e3
Update test_valid_docs for nspawn compatibility funcs
2015-03-03 10:10:50 -07:00
Erik Johnson
94d55889d7
Resolve merge conflicts
2015-02-28 12:35:25 -06:00
Erik Johnson
afb8439c1f
update test_valid_docs
2015-02-28 11:47:12 -06:00
Colton Myers
f00465a8a1
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/event/index.rst
salt/loader.py
salt/modules/config.py
salt/modules/cyg.py
salt/modules/hg.py
salt/modules/lxc.py
salt/modules/upstart.py
salt/states/hg.py
salt/utils/cloud.py
salt/utils/dictupdate.py
salt/utils/schedule.py
tests/integration/fileserver/gitfs_test.py
tests/unit/pydsl_test.py
2015-02-18 11:55:29 -07:00
Erik Johnson
f18a23c284
Ignore lack of CLI example in deprecated function
2015-02-10 15:06:47 -06:00
Pedro Algarvio
e6ab1d4ba1
Fix import
2015-01-30 22:25:19 +00:00
Pedro Algarvio
7360164558
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
rallytime
486aa982ad
Fix spelling error: doctring -> docstring
2014-07-15 09:26:55 -06:00
Erik Johnson
18a4c95f46
whitelist expand_repo_def in test_valid_docs
2014-01-16 22:40:22 -06:00
Gareth J. Greenaway
ca9197c5a7
Added missing definitions for networking setting, add and get. Changed interface parsing to use a dictionary for inet and inet6 interfaces instead of an array. Certain assumptions were made within the code on the order the ipv4 & ipv6 interfaces would appear, using a dictionary instead resolves some potential issues that could have popped up with an array. removing the tests for ip.get_network_settings and ip.build_network_settings from the exclusion.
2013-12-10 11:46:47 -08:00
Erik Johnson
a7769b358e
Quiet travis failures for new functions missing docstrings
2013-12-06 16:27:56 -06:00
Pedro Algarvio
d02a2bc224
Include the python encoding file header on tests.
2013-11-27 11:19:24 +00:00
Erik Johnson
945c3a22c8
allow cp.recv to fail integration.modules.sysmod.SysModuleTest
2013-08-14 20:29:31 -05:00
Erik Johnson
176ab16f40
adjust "CLI Example" test
2013-08-14 20:17:39 -05:00
Pedro Algarvio
738447d0a9
Updated integration.modules.sysmod test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
be54a503d9
Adapted code fix sys.path in case called from __main__. Adapted to salt-testing.
2013-06-28 00:12:56 +01:00
Pedro Algarvio
576a5a4b78
Some more sysmod testing improvements.
2013-06-27 23:15:36 +01:00
Pedro Algarvio
276858d619
Improve sys.list_functions tests.
2013-06-27 23:00:55 +01:00
Thomas S Hatch
17f292a21a
Add ignores for loaded depends modules
...
@jacksont, just fyi, we check the loaded modules for docstrings
2013-06-18 16:38:42 -06:00
Pedro Algarvio
b36747b084
pkg.expand_repo_def is allowed to fail on the sysmod integration tests.
2013-04-22 22:40:15 +01:00
Pedro Algarvio
cf75fc4ffb
Fix the sysmod examples regular expression to accept both examples and Examples.
2013-03-09 16:07:19 +00:00
Pedro Algarvio
fc44fde3e3
Improve example matching.
2013-02-17 13:23:51 +00:00
Pedro Algarvio
94455dace6
Show useful information from the failing test.
2013-02-17 12:52:36 +00:00
Thomas S Hatch
f65626db0b
Update pydsl tests, still failing though
2013-02-09 15:07:59 -07:00
Thomas S Hatch
68b5d29ea6
Get tests runnign until pydsl migration is complete
2013-02-08 13:21:35 -07:00
Thomas S Hatch
107b97e952
Add test to verify loader modules
2013-02-08 11:14:22 -07:00
Roman Imankulov
bb0ed1a3a7
Tests cleanup
...
Defined "integration.run_tests()" function which can be used to execute
a particular integration test case. Existing bolerplate code in modules
and states tests is replaced with following lines:
if __name__ == '__main__':
from integration import run_tests
run_tests(TestCaseName)
Typical usecase could look like this:
python integration/modules/pip.py --no-clean -vv
2012-07-20 12:25:08 +06:00
Baiju Muthukadan
cb5e3ea089
Add testrunner boilerplate code to run tests
2012-05-05 19:39:23 +05:30
Thomas S Hatch
5b3b5bb145
Add sys module tests
2012-03-28 12:07:48 -06:00
