Thomas S Hatch
579f900be6
Merge pull request #6328 from johnnoone/load-jinja-tag
...
Load jinja tag
2013-07-26 09:24:26 -07:00
Xavier Barbosa
c1b6e06a0f
added load tag, and revamped parsing
2013-07-26 09:30:41 +02:00
Pedro Algarvio
d52b109cdd
No general exception catching while rendering pillar. Refs #6305 . Refs #5910 .
...
* All errors while processing pillar data are now logged besides being returned.
* Removed the general exception catch. All we need to is check for the expected data type. If it ain't, log the error and continue to the next iteration.
* Added a mocked test case which besides testing the issue reported on #5910 , also tests for the proper includes data format and if salt fails accordingly and even if common data is merged.
2013-07-26 07:04:32 +01:00
Pedro Algarvio
98c63b9671
Test if --pre option argument ends up in the resulting command line for pip.install.
2013-07-24 08:03:50 +01:00
Thomas S Hatch
b93369d334
Merge pull request #6233 from johnnoone/jinja-import-yaml
...
Jinja import yaml
2013-07-20 19:55:54 -07:00
Pedro Algarvio
83004fd8f8
Allow salt.utils.warn_until() to not issue the warning because we're only after the RuntimeError behaviour.
2013-07-20 16:26:47 +01:00
Pedro Algarvio
eaa0b16e53
Added a helper function to raise warnings until a specified salt version.
...
The helper raises a warning, by default, a ``DeprecationWarning``, until the provided ``version_info`` is matched, after which, a ``RuntimeError`` will be raised to remember the developers to remove the warning.
2013-07-20 15:32:50 +01:00
Pedro Algarvio
40c5512bfb
Properly deprecate check_dns.
...
Instead of having to leave `**kwargs` "forever" in `salt.config.minion_config` and `salt.config.apply_minion_config` in order to support API access to those which still passes `check_dns`. Support the argument but show a deprecation warning once. Leave the deprecation warning for 2 major releases. Then, finally, and properly, remove `check_dns` for good.
2013-07-20 01:39:23 +01:00
Pedro Algarvio
b03a5fcee3
Stop using the deprecated check_dns in salt.config.minion_config.
2013-07-20 01:38:09 +01:00
Xavier Barbosa
11ef87bd5d
finished cleanup
2013-07-19 16:53:51 +02:00
Xavier Barbosa
abd031963f
removed anchored yaml, does not work with CDumper...
2013-07-19 16:50:59 +02:00
Xavier Barbosa
f381590256
try to fix travis exception
2013-07-19 16:24:32 +02:00
Xavier Barbosa
f8bf53b682
added doc for yaml / json tags
2013-07-19 16:02:29 +02:00
Xavier Barbosa
9288281c63
added to jinja load* filters and tags
2013-07-19 16:02:28 +02:00
Xavier Barbosa
117f76def4
added AnchoredDumper
2013-07-19 16:02:28 +02:00
Pedro Algarvio
7aed6aeb30
Actually, the Syndic config test case can be a simple unit test.
2013-07-17 16:43:18 +01:00
Pedro Algarvio
e467b1e00b
Simplify the Syndic configuration testing.
...
* Inherit the master configuration file on the syndic one.
* Recreate the Syndic on the test. Don't pass it as a module global.
2013-07-17 16:22:18 +01:00
Pedro Algarvio
54ea179467
Only create TMP if it doesn't already exists (hint: --no-clean)
2013-07-17 12:34:36 +01:00
Pedro Algarvio
db6553a019
Skip unit.templates.jinja_test.TestGetTemplate.test_strftime test if timelib is not installed.
2013-07-17 11:23:42 +01:00
Thomas S Hatch
b8f26dad8d
Merge pull request #6124 from johnnoone/strftime-formatter
...
Strftime formatter
2013-07-16 17:11:46 -07:00
Mathieu Le Marec - Pasquet
cff1fa6f53
fix/feat: let the syndic be way more configurable
...
- Fix micmac between configs
- Add options to configure pidfile, logfile, masterofmaster port
This fixes #6024 .
2013-07-15 20:30:26 +00:00
Xavier Barbosa
22e1da9148
changed dateutil by timelib saltstack/salt#6088
2013-07-15 11:12:23 +02:00
Xavier Barbosa
00e373b63b
added unittests for strftime filter saltstack/salt#6088
2013-07-15 11:12:21 +02:00
Pedro Algarvio
d6b1e60fb1
Added a mocked test case for pip.list with prefix matching.
2013-07-14 20:53:36 +01:00
Pedro Algarvio
01f489c79d
Added a mocked test case for pip.list.
2013-07-14 19:30:08 +01:00
Pedro Algarvio
c83e767e06
Added a mocked test case for pip freeze.
2013-07-14 19:25:44 +01:00
Pedro Algarvio
e17599a820
Added a mocked test case for --timeout passing to pip uninstall.
2013-07-14 19:02:41 +01:00
Pedro Algarvio
71c278384b
Added a mocked test case for --log passing to pip uninstall.
2013-07-14 19:01:27 +01:00
Pedro Algarvio
3e97e36e78
Added a mocked test case for --proxy passing to pip uninstall.
2013-07-14 18:59:23 +01:00
Pedro Algarvio
95ee5a9f36
Added a mocked test case for --proxy passing to pip install.
2013-07-14 18:59:22 +01:00
Pedro Algarvio
315c1f911d
Added a mocked test case for multiple --requirements passing to pip uninstall.
2013-07-14 18:59:22 +01:00
Pedro Algarvio
5435dc69e1
Added a mocked test case for multiple --requirements passing to pip install.
2013-07-14 18:59:22 +01:00
Pedro Algarvio
411c926146
Prefix tests with install since they're testing the install command.
2013-07-14 18:59:22 +01:00
Pedro Algarvio
02034c4d86
Added a mocked test case for --no-install passing to pip install.
2013-07-14 18:59:18 +01:00
Pedro Algarvio
716f760e80
Added a mocked test case for --no-deps passing to pip install.
2013-07-14 18:59:13 +01:00
Pedro Algarvio
89fa6cecf4
Added a mocked test case for --ignore-installed passing to pip install.
2013-07-14 18:59:08 +01:00
Pedro Algarvio
892646bdee
Added a mocked test case for --force-reinstall passing to pip install.
2013-07-14 18:59:01 +01:00
Pedro Algarvio
03c88dac2c
Added a mocked test case for --upgrade passing to pip install.
2013-07-14 18:58:56 +01:00
Pedro Algarvio
27959701dc
Added support and a mocked test case for --global-options passing to pip install.
2013-07-14 18:58:49 +01:00
Pedro Algarvio
fd200c96b0
Added a mocked test case for --install-options passing to pip install.
...
* Replaced all occurrences of `basestring` with the `string_types` from salt's `_compat` module.
* Properly split install options on commas.
* Install options need to be quoted.
2013-07-14 18:58:44 +01:00
Pedro Algarvio
12d05e4b9a
Added a mocked test case for --exists-action passing to pip install.
...
* `exists_action` now only accepts it's valid settings, one of `s`, `i`, `w`, `b`, else, `CommandExecutionError`.
2013-07-14 18:58:37 +01:00
Pedro Algarvio
fb16313804
Added a mocked test case for --source passing to pip install.
2013-07-14 18:58:33 +01:00
Pedro Algarvio
85b0d7964d
Added a mocked test case for --no-download passing to pip install.
2013-07-14 18:58:28 +01:00
Pedro Algarvio
60ef910bad
Added a mocked test case for --download-cache passing to pip install.
2013-07-14 18:58:24 +01:00
Pedro Algarvio
bfcd91d700
Added a mocked test case for --download passing to pip install.
2013-07-14 18:58:12 +01:00
Pedro Algarvio
6fbbd5fb31
Added a mocked test case for --target passing to pip install.
2013-07-14 18:58:06 +01:00
Pedro Algarvio
aa8dda75c7
Added a mocked test case for --build passing to pip install.
2013-07-14 18:57:58 +01:00
Pedro Algarvio
6e0e8fddf9
Added a mocked test case for --no-index passing to pip install.
2013-07-14 18:57:52 +01:00
Pedro Algarvio
467d7de4e5
Added a mocked test case for --extra-index-url passing to pip install.
2013-07-14 18:57:47 +01:00
Pedro Algarvio
900682ac51
Added a mocked test case for --index-url passing to pip install.
2013-07-14 18:57:43 +01:00
