Dmitry Kuzmenko
17b03e9d8b
Allow to blacklist/whitelist renderers. ( #33358 )
...
* Allow to blacklist/whitelist renderers.
* Fix tests.
* Unit test for renderer blacklisting.
* Minor tests fixes
2016-05-20 10:41:51 -07:00
Sean Jenkins
41353b7ab3
Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead
2015-12-29 10:22:54 -07:00
Matthias Erll
042314246f
Unit test for merging included pillars.
2015-10-28 21:45:26 +01:00
Matthias Erll
2f3f2d6f29
Consider each pillar match only once.
2015-10-28 13:56:44 +01:00
Michael Steed
4b6b4d1cad
py3: fix tests/unit/pillar_test.py
...
- write bytes to temp files
- work around py3 mock bug
2015-06-11 10:33:00 -06:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
Pedro Algarvio
4d7ca91424
Remove unnecessary ©️ and :license: from file headers
2014-05-26 19:26:15 +01:00
Pedro Algarvio
982d8117b9
Allow standalone test execution
2014-03-31 02:59:04 +01:00
Pedro Algarvio
0ae1a15c61
PEP8 E302 and E303 blank lines fixes.
2013-11-27 12:11:45 +00:00
Pedro Algarvio
1bf652541d
Avoid unnecessary KeyError's while testing.
2013-10-15 22:42:21 +01:00
Pedro Algarvio
e18ba0758b
Don't include authorship in generated documentation, the Sphinx way.
2013-09-16 17:24:00 +01:00
Pedro Algarvio
296c83be1f
Adapted unit.pillar_test to use salttesting.mock
2013-08-26 13:01:02 +00:00
Luper Rouch
fafdfa1800
added support for order clauses in pillar top files
...
Conflicts:
tests/unit/pillar_test.py
2013-08-07 22:57:42 +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
