aboutsummaryrefslogtreecommitdiff
path: root/tests/test_imports.py
diff options
context:
space:
mode:
authorRene Leonhardt <rene.leonhardt@gmail.com>2009-04-20 23:08:53 +0200
committerRene Leonhardt <rene.leonhardt@gmail.com>2009-04-20 23:08:53 +0200
commitc7e6c6d2e573804709ba4c01433860f785a865c7 (patch)
tree4d7c245a05ba7c30e83f1a7b1b0dad7a2155522b /tests/test_imports.py
parent94ee6aa9788fa4577566efd4313bf84cdb2e48d8 (diff)
downloadjinja-c7e6c6d2e573804709ba4c01433860f785a865c7.tar.gz
Support nose framework for the whole test suite.
--HG-- branch : trunk
Diffstat (limited to 'tests/test_imports.py')
-rw-r--r--tests/test_imports.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/test_imports.py b/tests/test_imports.py
index f5b227f2..b865f6dc 100644
--- a/tests/test_imports.py
+++ b/tests/test_imports.py
@@ -6,10 +6,15 @@
:copyright: (c) 2009 by the Jinja Team.
:license: BSD, see LICENSE for more details.
"""
-from py.test import raises
from jinja2 import Environment, DictLoader
from jinja2.exceptions import TemplateNotFound
+import conftest
+if conftest.NOSE:
+ from nose.tools import assert_raises as raises
+else:
+ from py.test import raises
+
test_env = Environment(loader=DictLoader(dict(
module='{% macro test() %}[{{ foo }}|{{ bar }}]{% endmacro %}',