Got rid of py.testisms.
--HG--
branch : trunk
diff --git a/tests/test_inheritance.py b/tests/test_inheritance.py
index 19c3fc2..58b992f 100644
--- a/tests/test_inheritance.py
+++ b/tests/test_inheritance.py
@@ -10,9 +10,6 @@
from jinja2 import Environment, DictLoader
from jinja2.exceptions import TemplateSyntaxError
-import conftest
-conftest.GlobalLoader.scope = globals()
-
LAYOUTTEMPLATE = '''\
|{% block block1 %}block 1 from layout{% endblock %}
@@ -52,31 +49,40 @@
{% endblock %}
'''
-def test_layout(env):
+env = Environment(loader=DictLoader({
+ 'layout': LAYOUTTEMPLATE,
+ 'level1': LEVEL1TEMPLATE,
+ 'level2': LEVEL2TEMPLATE,
+ 'level3': LEVEL3TEMPLATE,
+ 'level4': LEVEL4TEMPLATE,
+ 'working': WORKINGTEMPLATE
+}), trim_blocks=True)
+
+def test_layout():
tmpl = env.get_template('layout')
assert tmpl.render() == ('|block 1 from layout|block 2 from '
'layout|nested block 4 from layout|')
-def test_level1(env):
+def test_level1():
tmpl = env.get_template('level1')
assert tmpl.render() == ('|block 1 from level1|block 2 from '
'layout|nested block 4 from layout|')
-def test_level2(env):
+def test_level2():
tmpl = env.get_template('level2')
assert tmpl.render() == ('|block 1 from level1|nested block 5 from '
'level2|nested block 4 from layout|')
-def test_level3(env):
+def test_level3():
tmpl = env.get_template('level3')
assert tmpl.render() == ('|block 1 from level1|block 5 from level3|'
'block 4 from level3|')
-def test_level4(env):
+def test_level4():
tmpl = env.get_template('level4')
assert tmpl.render() == ('|block 1 from level1|block 5 from '
'level3|block 3 from level4|')
@@ -96,11 +102,11 @@
assert tmpl.render() == '--INTRO--|BEFORE|[(INNER)]|AFTER'
-def test_working(env):
+def test_working():
tmpl = env.get_template('working')
-def test_reuse_blocks(env):
+def test_reuse_blocks():
tmpl = env.from_string('{{ self.foo() }}|{% block foo %}42{% endblock %}|{{ self.foo() }}')
assert tmpl.render() == '42|42|42'