Commit Graph

15789 Commits

Author SHA1 Message Date
Pedro Algarvio
14980b7497 Update the archive.tar mocked test to the new usage. 2013-07-29 06:57:27 +01:00
Pedro Algarvio
2ef634dc0b salt.modules.archive.tar() cannot make use of *args magic. 2013-07-29 06:56:02 +01:00
Pedro Algarvio
7bcad318c5 One more fix to identical_signature_wrapper the original call should not include the argspec with defaults. 2013-07-29 06:45:58 +01:00
Pedro Algarvio
7873a1284a We want keyword arguments with their defaults in the signature. 2013-07-29 03:20:31 +01:00
Pedro Algarvio
1f83aa6743 The wrapped function now uses the same name as the original. 2013-07-28 23:16:06 +01:00
Pedro Algarvio
4855c9427c Simplify our decorator code and make it reusable. 2013-07-28 22:55:27 +01:00
Pedro Algarvio
73409e025f Salt needs to have it's module functions with a proper signature. 2013-07-28 22:26:59 +01:00
Pedro Algarvio
5d0af6268e Mocked test for salt.modules.archive.gunzip() 2013-07-28 12:51:13 +01:00
Pedro Algarvio
99b8f2f70f Mocked test for salt.modules.archive.gzip() 2013-07-28 12:50:05 +01:00
Pedro Algarvio
dcdb9bf686 Mocked test for salt.modules.archive.tar() 2013-07-27 19:24:49 +01:00
Pedro Algarvio
2f8b564259 Don't obfuscate thezip built-in. 2013-07-27 19:13:35 +01:00
Pedro Algarvio
61afe18168 One less TODO. Check for the existence of the binary before running the function. 2013-07-27 19:10:03 +01:00
Pedro Algarvio
69e30346ca Added a which decorator to be used in functions which require a specific binary. 2013-07-27 19:03:54 +01:00
Pedro Algarvio
419bf0af94 Formatting fixes to decorators utils module. 2013-07-27 18:36:25 +01:00
Thomas S Hatch
bca8014b00 Merge pull request #6347 from s0undt3ch/sprint/mock-salt.modules.alternatives
Mocked tests for `salt.modules.alternatives`
2013-07-27 10:14:17 -07:00
Pedro Algarvio
aabf18d76a Remove un-neded import. 2013-07-27 18:11:55 +01:00
Pedro Algarvio
43b513e78f Mocked test for salt.modules.alternatives.remove() 2013-07-27 18:07:18 +01:00
Pedro Algarvio
fa811882cc Mocked test for salt.modules.alternatives.install() 2013-07-27 18:04:04 +01:00
Pedro Algarvio
6f10a44279 Mocked test for salt.modules.alternatives.check_installed() 2013-07-27 17:59:16 +01:00
Pedro Algarvio
068f0d6948 Mocked test for salt.modules.alternatives.show_current() 2013-07-27 17:56:05 +01:00
Pedro Algarvio
4b2ef2c3c8 Mocked test for salt.modules.alternatives.display() 2013-07-27 17:26:54 +01:00
Joseph Hall
60728c72f7 Merge pull request #6345 from s0undt3ch/hotfix/pip-tests
PIP module and state test cases, and minor improvments
2013-07-27 08:52:58 -07:00
Pedro Algarvio
55fd4273cc Simplify __virtual__ logic. 2013-07-27 16:50:56 +01:00
Pedro Algarvio
42641c6153 Added test case to see if the usage of user and runas at the same time raises an exception. 2013-07-27 16:02:59 +01:00
Pedro Algarvio
c072fa0241 Also deprecate runas on salt.states.pip.
* Added mock tests to check if the deprecation is triggered, and to see if the deprecation is also returned to the user in a warnings key.
2013-07-27 15:58:28 +01:00
Joseph Hall
7062ff4366 Merge pull request #6344 from mikadosoftware/minor-doc-fix
Trivial doc spelling fix
2013-07-27 07:14:06 -07:00
Joseph Hall
16f28ca935 Merge pull request #6343 from go8ose/note-pillar-flat
Document how the pillar namespace is flattened.
2013-07-27 06:46:18 -07:00
Pedro Algarvio
07e7366728 user and runas now raise an exception. "There can be only one".
* Always show the deprecation message `runas` is not `None`.
* If both `user` and `runas` are used, that's an error! Full Stop!
* If `runas` is being used and `user` is not, adapt the code and don't fail.
2013-07-27 13:34:58 +01:00
Paul Brian (lifeisstillgood)
fe4559101e Trivial doc spelling fix
It is trivial but it is my first commit / pull request so useful for
checking the process is correct. And it has a semicolon
2013-07-27 13:07:44 +01:00
Pedro Algarvio
5ee8073979 Test the deprecated runas argument to salt.modules.pip. 2013-07-27 13:06:36 +01:00
Pedro Algarvio
a33f9d771b Alaways show triggered deprecation warnings on the unit test. 2013-07-27 13:04:59 +01:00
Geoff Crompton
c0588d42db Document how the pillar namespace is flattened. 2013-07-27 16:35:55 +10:00
Seth House
80ba227409 Merge pull request #6342 from terminalmage/quickfix
Fix indentation in the minion config template
2013-07-26 22:56:19 -07:00
Erik Johnson
17ebff3b9d Fix indentation in the minion config template
The example for the 'backup' param in the minion config file template is
indented one level further than it should. This commit fixes that.
2013-07-27 00:28:15 -05:00
Thomas S Hatch
84274aa1c4 Merge pull request #6341 from terminalmage/travis
Change runas to user for pip module tests
2013-07-26 16:42:47 -07:00
Erik Johnson
d36fa57595 Change runas to user for pip module tests 2013-07-26 18:40:36 -05:00
Thomas S Hatch
dc5a07fdb9 Merge pull request #6339 from terminalmage/quickfix
pip: deprecate runas param
2013-07-26 15:46:55 -07:00
Erik Johnson
aa6918da5d remove unnecessary **kwargs 2013-07-26 17:44:30 -05:00
Erik Johnson
203c391d41 use salt.utils.warn_until for deprecation warning 2013-07-26 17:38:14 -05:00
Erik Johnson
635ddec315 Add proper deprecation warning for runas arg in pip module
Also remove the ability to use runas interchangeably in the state. If
we're going to deprecate it, no need to let people get used to using
runas in their states.
2013-07-26 17:21:33 -05:00
Erik Johnson
1d9599ca63 pip: Make runas and user work interchangeably
The pip state uses "user", while the module uses "runas".  This needs to
be unified in 0.17.0, but until then this commit makes these arguments
interchangeable.
2013-07-26 16:21:48 -05:00
David Boucha
4ee5284569 Merge pull request #6337 from UtahDave/develop
Use proper escapes for Travis' sanity
2013-07-26 11:42:43 -07:00
David Boucha
798d891417 Use proper escapes for Travis' sanity 2013-07-26 12:41:48 -06:00
Joseph Hall
294d668385 Merge pull request #6336 from terminalmage/quickfix
bsd_shadow: add note on escaping dollar signs
2013-07-26 11:20:33 -07:00
Erik Johnson
335f077ac5 bsd_shadow: add note on escaping dollar signs 2013-07-26 13:18:23 -05:00
Colton Myers
197d8dab0f Merge pull request #6334 from UtahDave/develop
Escape the $s because they're being interpolated
2013-07-26 11:07:38 -07:00
David Boucha
65dde6bff6 Escape the $s because they're being interpolated 2013-07-26 11:59:50 -06:00
Thomas S Hatch
45cb885301 Merge pull request #6331 from terminalmage/docs
Lots of docs on salt fileserver environments
2013-07-26 10:33:24 -07:00
Thomas S Hatch
5aa4b8206b Merge pull request #6332 from d--j/patch-1
Make state.show_{highstate,lowstate,sls} work with PyDSL
2013-07-26 10:32:46 -07:00
Daniel Jagszent
9c74fc8a9e Make state.show_{highstate,lowstate,sls} work with PyDSL
PyDSL needs an active HighState. If you have any sls file that uses the "pydsl" renderer you cannot use state.show_highstate, state.show_lowstate and state.show_sls at the moment.
Pushing the HighState on the active queue fixes this.
2013-07-26 19:27:59 +02:00