Commit Graph

7 Commits

Author SHA1 Message Date
Mathieu Le Marec - Pasquet
9a9eada12f Better trace for nested jinja errors 2014-01-03 18:16:11 +01:00
Thomas S Hatch
30c49e32c7 Revert "Better trace for nested jinja errors"
This reverts commit 78899493bb.
2013-12-31 12:22:24 -07:00
Mathieu Le Marec - Pasquet
78899493bb Better trace for nested jinja errors 2013-12-31 13:25:57 +00:00
Thomas S Hatch
5eaca79810 Revert "Better trace for nested jinja errors"
This reverts commit 99a2791917.
2013-12-30 11:32:53 -07:00
Mathieu Le Marec - Pasquet
99a2791917 Better trace for nested jinja errors 2013-12-25 18:00:15 +00:00
Pedro Algarvio
a5a87ca1fc Mimic the test case shown @ http://goo.gl/UI7uS8 2013-10-08 00:11:19 +01:00
Eivind Uggedal
ab7ace6aa5 Split out integration tests from pure unit tests.
Integration tests requiring a salt master and daemon were seperated
from pure unit tests. For now both are run with runtest.py. In
the future it could take arguments for which type of tests to run.
2012-02-20 13:18:13 +01:00