Dmitry Kuzmenko
df2b40e854
Fixed @depends integration test
2015-10-26 16:07:52 +03:00
Colton Myers
bd6ecdfd43
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/gitfs.rst
salt/pillar/pepa.py
salt/states/artifactory.py
salt/states/pip_state.py
salt/transport/__init__.py
2015-04-21 10:42:22 -06:00
Pedro Algarvio
ae2bca1f6f
Fix W1504(unidiomatic-typecheck
2015-04-21 14:02:17 +01:00
Colton Myers
d17c908b42
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/pillar/index.rst
salt/beacons/diskusage.py
salt/beacons/network_info.py
salt/minion.py
salt/modules/iptables.py
salt/modules/nacl.py
salt/modules/win_firewall.py
2015-03-09 12:52:14 -06:00
Thomas Jackson
9fa37fd46b
Add raw boolean support to depends decorator
2015-03-05 21:59:10 -08:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
Pedro Algarvio
d02a2bc224
Include the python encoding file header on tests.
2013-11-27 11:19:24 +00:00
Pedro Algarvio
d62211f734
Updated integration.modules.decorators test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:12:59 +01:00
Pedro Algarvio
6dfe563ce1
Added support for __main__ execution.
2013-06-28 00:12:57 +01:00
Thomas S Hatch
e2d7f21034
@jacksont, please take a look at these, they are failing sometimes
2013-06-20 11:22:59 -06:00
Thomas S Hatch
ec2ab4d5d3
Fix up tests for decorators
2013-06-20 11:21:56 -06:00
Thomas Jackson
3016999c04
Adding "Depends" decorator to salt.utils
...
The Depends decorator allows you to optionally remove functions if sepecific globals/modules don't exist. This is particuarly helpful in larger scale deployments where some functions of the module work everywhere, but others require (for example) a service to be installed. This way you can avoid having to try/except all over the module to only load certain functions etc.
2013-06-14 15:17:06 -07:00
