Merge with stable.

1 files changed, 9 insertions, 14 deletions

diff --git a/tests/test_templating.py b/tests/test_templating.py
index e8fafca2..5f8fcaeb 100644
--- a/tests/test_templating.py
+++ b/tests/test_templating.py
@@ -9,28 +9,23 @@
     :license: BSD, see LICENSE for details.
 """
 
-from util import test_roots, with_app
+from util import with_app
 
 
-def teardown_module():
-    (test_roots / 'test-templating' / '_build').rmtree(True),
-
-
-@with_app(buildername='html', srcdir=(test_roots / 'test-templating'))
-def test_layout_overloading(app):
-    app.builder.build_all()
+@with_app('html', testroot='templating')
+def test_layout_overloading(app, status, warning):
+    app.builder.build_update()
 
     result = (app.outdir / 'contents.html').text(encoding='utf-8')
 
     assert '<!-- layout overloading -->' in result
 
 
-@with_app(buildername='html', srcdir=(test_roots / 'test-templating'))
-def test_autosummary_class_template_overloading(app):
-    app.builder.build_all()
+@with_app('html', testroot='templating')
+def test_autosummary_class_template_overloading(app, status, warning):
+    app.builder.build_update()
 
-    result = (app.outdir / 'generated' / 'sphinx.application.Sphinx.html').text(
-                encoding='utf-8')
+    result = (app.outdir / 'generated' / 'sphinx.application.TemplateBridge.html').text(
+        encoding='utf-8')
 
     assert 'autosummary/class.rst method block overloading' in result
-