Improved test invokation. Picks up doctests within Jinja now, changed
doctests that just show usage that would not work on their own so that
they are standard code blocks now and do not disturb testing.
--HG--
branch : trunk
diff --git a/tests/test_debug.py b/tests/test_debug.py
index d8e8a44..921b335 100644
--- a/tests/test_debug.py
+++ b/tests/test_debug.py
@@ -32,9 +32,9 @@
>>> tmpl = env.get_template('syntaxerror.html')
Traceback (most recent call last):
...
-TemplateSyntaxError: unknown tag 'endif'
- File "loaderres/templates\\syntaxerror.html", line 4
- {% endif %}
+ File "tests/loaderres/templates/syntaxerror.html", line 4, in template
+ {% endif %}
+TemplateSyntaxError: Encountered unknown tag 'endif'. Jinja was looking for the following tags: 'endfor' or 'else'. The innermost block that needs to be closed is 'for'.
'''
diff --git a/tests/test_loaders.py b/tests/test_loaders.py
index 17e6bf1..64193f3 100644
--- a/tests/test_loaders.py
+++ b/tests/test_loaders.py
@@ -7,6 +7,7 @@
:license: BSD, see LICENSE for more details.
"""
+import os
import time
import tempfile
from jinja2 import Environment, loaders
@@ -20,7 +21,7 @@
'justdict.html': 'FOO'
})
package_loader = loaders.PackageLoader('loaderres', 'templates')
-filesystem_loader = loaders.FileSystemLoader('loaderres/templates')
+filesystem_loader = loaders.FileSystemLoader('tests/loaderres/templates')
function_loader = loaders.FunctionLoader({'justfunction.html': 'FOO'}.get)
choice_loader = loaders.ChoiceLoader([dict_loader, package_loader])
prefix_loader = loaders.PrefixLoader({