Commit Graph

1470 Commits

Author SHA1 Message Date
Jeffrey C. Ollie
b1fb52a680 fix more funcion => function typos 2013-11-15 14:50:17 -06:00
Emil Stenqvist
f487d5568a Fix for issue #8519
Also added a test that fails prior to the fix, illustrating the problem.
2013-11-14 14:26:35 +01:00
Pedro Algarvio
8ba59ea6c6 Adapt the tests to the latest Jinja2 template changes. 2013-11-14 01:21:57 +00:00
Pedro Algarvio
55e0290da6 Fix the mocked contents pillar file state tests. 2013-11-12 07:55:03 +00:00
Pedro Algarvio
54fc502de0 Some more saltenv related tests. 2013-11-12 06:29:55 +00:00
Pedro Algarvio
f25f0a41b2 Deprecate env usage in favor of saltenv. 2013-11-12 01:01:51 +00:00
Pedro Algarvio
097aed1e7e Show the error in case of failure. 2013-11-12 01:01:51 +00:00
Pedro Algarvio
f4cba0d293 Deprecate env usage in favor of saltenv. 2013-11-12 01:01:50 +00:00
Pedro Algarvio
d88d34ca24 The GitHub IP changed. 2013-11-11 07:45:10 +00:00
Pedro Algarvio
4fb38e1e91 Merge pull request #8385 from s0undt3ch/hotfix/test-kwarg
Document passing arguments with equal signs. Refs a1ba178d.
2013-11-10 10:28:20 -08:00
Pedro Algarvio
a192d03ffb Only delete the file if it actually exists. 2013-11-10 15:36:39 +00:00
Pedro Algarvio
66cf8f1845 The argument name is arg, not args. 2013-11-10 15:36:11 +00:00
Pedro Algarvio
0f25353e08 Pass a relative path for proper test execution.
If we're trying to test a failure which happens when the path is not absolute, let's not pass it an absolute path in the first place.
2013-11-10 15:30:42 +00:00
Pedro Algarvio
c66fc86f79 Document passing arguments with equal signs. Refs a1ba178d.
Add additional documentation regarding arguments passing with equal signs for which salt tries hard to turn into keyword arguments. The problem now arises because non supported arguments immediately thrown an exception.
2013-11-10 11:40:01 +00:00
Joseph Hall
34360ac306 Merge pull request #8373 from s0undt3ch/develop
Typo
2013-11-09 05:29:57 -08:00
Pedro Algarvio
b5c9815e9a Arguments like pip==1.0 must not match yaml'ification as as keyword arguments. 2013-11-09 10:32:27 +00:00
Pedro Algarvio
544f7e127d Don't use the deprecated self.assertEquals(). 2013-11-09 09:01:18 +00:00
Pedro Algarvio
dfab7aab73 Adapt the runtests parser to support running the tests suite under a Docker container. 2013-11-08 20:20:03 +00:00
Pedro Algarvio
960118df29 Reintroduce the removed grains information.
Removed on 4617a931be and 52be720d62.
2013-11-08 19:50:38 +00:00
Pedro Algarvio
34ed606b0d Revert "Remove debugging pprint"
This reverts commit 4617a931be.
2013-11-08 19:39:30 +00:00
Pedro Algarvio
3b1f2126fb Revert "Remove unused grains lookup"
This reverts commit 52be720d62.
2013-11-08 19:39:12 +00:00
Thomas S Hatch
0ca3a1093b Merge pull request #8332 from s0undt3ch/issues/__sls__-KeyError
Take into account python types not just Yaml strings
2013-11-07 16:01:16 -08:00
Thomas S Hatch
d4ddb8344d Merge pull request #8329 from cachedout/#8259
Exception handling for missing id
2013-11-07 15:59:39 -08:00
Pedro Algarvio
77101231f2 Install a smaller and with less dependencies package. 2013-11-07 22:09:36 +00:00
Mike Place
00c7d36966 Exception handling for missing id
Refs #8259. We don't like tracebacks. Includes unit test.
2013-11-07 11:59:07 -07:00
Seth House
cf3df20aad Merge pull request #8323 from regilero/default-for-grains_filter_by
Default for filter_by method in module grains
2013-11-07 09:38:26 -08:00
Colton Myers
78662d270b Merge pull request #8325 from cachedout/#7860
Add a dir_mode to file.managed
2013-11-07 09:35:54 -08:00
Mike Place
2e6bf21635 Integration testing for file.managed dir_mode argument.
Added documentation for dir_mode to file.managed.
2013-11-07 10:19:16 -07:00
regilero
9dce9ac304 Add unit tests for grains.filter_by 2013-11-07 17:15:30 +01:00
Henrik Holmboe
043f9bf85a Fix typos 2013-11-07 10:06:37 +01:00
Thomas S Hatch
e64f7b0633 Merge pull request #8311 from s0undt3ch/issues/8196-environments
Some more `saltenv` related changes/fixes
2013-11-06 16:07:25 -08:00
Pedro Algarvio
0f9ded1a7a Fix the pip unit tests with regards to the latest saltenv changes. 2013-11-06 23:53:45 +00:00
Pedro Algarvio
ec0a4bca8e URL environment selection should also be using saltenv. 2013-11-06 23:36:40 +00:00
Thomas S Hatch
68d5b2c21a Merge pull request #8289 from jacksontj/develop
Covering case where kwarg cannot be un-yaml'd
2013-11-06 15:05:14 -08:00
Pedro Algarvio
b82a051aef Correctly trigger the issue reported on #8196. 2013-11-06 22:49:29 +00:00
Pedro Algarvio
3477300d7f Add a test case to check for proper env selection when passing ?env=foo. Refs #8196. 2013-11-06 22:47:55 +00:00
Thomas S Hatch
a343e69d02 Merge pull request #8230 from s0undt3ch/issues/8196-environments
Properly pass `__env__` to states.
2013-11-06 14:23:26 -08:00
Pedro Algarvio
962f8d4149 Support adding files to the testing prod state env. 2013-11-06 20:18:47 +00:00
Pedro Algarvio
9a22d3053e The pip module no longer accepts __env__ as a kwarg. 2013-11-06 20:15:23 +00:00
Pedro Algarvio
4c84b1da3e State unit tests need to have an hardcoded __env__. 2013-11-06 20:04:54 +00:00
Pedro Algarvio
56129e3610 Include the holy directory for the __env__ selection test cases. 2013-11-06 20:04:54 +00:00
Pedro Algarvio
c170d1e572 Updated test cases to include environment selection in states using __env__. 2013-11-06 20:04:54 +00:00
Pedro Algarvio
0a03ecc6bc Add required state file. 2013-11-06 20:04:10 +00:00
Pedro Algarvio
e334e232d1 Forgot to add the top file. 2013-11-06 20:04:10 +00:00
Pedro Algarvio
ec76b188b1 Correctly trigger the issue reported on #8196. 2013-11-06 20:03:44 +00:00
Pedro Algarvio
2924f1c14a Add a test case to check for proper env selection when passing ?env=foo. Refs #8196. 2013-11-06 20:03:44 +00:00
Erik Johnson
5ef4b31e97 Include more information in test docstrings
This adds additional information that describes the relevant code being
tested, so that if there is a problem it is easier to trace it back to
where the problem lies.
2013-11-06 14:03:33 -06:00
Erik Johnson
3c799c0bd5 Add test for arguments with dashes in the arg name 2013-11-06 14:00:02 -06:00
Erik Johnson
f24fb7c26f Add test for unsupported kwarg 2013-11-06 13:38:30 -06:00
Thomas Jackson
01f2d119b1 Covering case where kwarg cannot be un-yaml'd
In the past the master has been taking the kwargs passed in and converting them to a string (kwy=value) and letting the minion de-yaml that arg string. In general this is okay, but it doesn't work well if you are calling from the python LocalClient interface-- since the kwarg you passed already had a type. With this change instead of converting the kwarg to a string it is converted to a dict with a flag to mark it as a kwarg dict, then it is unpacked on the minion side while still maintining type
2013-11-05 19:04:23 -08:00