Commit Graph

6 Commits

Author SHA1 Message Date
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