9 files changed, 23 insertions, 12 deletions
diff --git a/docs/tutorials/wiki/src/authorization/.coveragerc b/docs/tutorials/wiki/src/authorization/.coveragerc
index a1d87d03d..5db0e79cf 100644
--- a/docs/tutorials/wiki/src/authorization/.coveragerc
+++ b/docs/tutorials/wiki/src/authorization/.coveragerc
@@ -1,3 +1,2 @@
 [run]
 source = tutorial
-omit = tutorial/test*
diff --git a/docs/tutorials/wiki/src/authorization/MANIFEST.in b/docs/tutorials/wiki/src/authorization/MANIFEST.in
index 05cc195d9..b4624fd1c 100644
--- a/docs/tutorials/wiki/src/authorization/MANIFEST.in
+++ b/docs/tutorials/wiki/src/authorization/MANIFEST.in
@@ -1,2 +1,5 @@
 include *.txt *.ini *.cfg *.rst
 recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2
+recursive-include tests *
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
diff --git a/docs/tutorials/wiki/src/authorization/pytest.ini b/docs/tutorials/wiki/src/authorization/pytest.ini
index a3489cdf8..42c3259f9 100644
--- a/docs/tutorials/wiki/src/authorization/pytest.ini
+++ b/docs/tutorials/wiki/src/authorization/pytest.ini
@@ -1,3 +1,6 @@
 [pytest]
-testpaths = tutorial
-python_files = test*.py
+addopts = --strict
+
+testpaths =
+    tutorial
+    tests
diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py
index fa5948acb..f19d643e6 100644
--- a/docs/tutorials/wiki/src/authorization/setup.py
+++ b/docs/tutorials/wiki/src/authorization/setup.py
@@ -44,7 +44,7 @@ setup(
     author_email='',
     url='',
     keywords='web pyramid pylons',
-    packages=find_packages(),
+    packages=find_packages(exclude=['tests']),
     include_package_data=True,
     zip_safe=False,
     extras_require={
diff --git a/docs/tutorials/wiki/src/authorization/tests/__init__.py b/docs/tutorials/wiki/src/authorization/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/docs/tutorials/wiki/src/authorization/tests/__init__.py
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/tests.py b/docs/tutorials/wiki/src/authorization/tests/test_it.py
index 6279d9f66..6c72bcc62 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/authorization/tests/test_it.py
@@ -11,8 +11,14 @@ class ViewTests(unittest.TestCase):
         testing.tearDown()
 
     def test_my_view(self):
-        from .views.default import my_view
+        from tutorial.views.default import my_view
         request = testing.DummyRequest()
         info = my_view(request)
         self.assertEqual(info['project'], 'myproj')
 
+    def test_notfound_view(self):
+        from tutorial.views.notfound import notfound_view
+        request = testing.DummyRequest()
+        info = notfound_view(request)
+        self.assertEqual(info, {})
+
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/layout.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/layout.pt
index b606e8dad..06a3c8157 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/layout.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/layout.pt
@@ -1,5 +1,5 @@
 <!DOCTYPE html metal:define-macro="layout">
-<html lang="{{request.locale_name}}">
+<html lang="${request.locale_name}">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/views/default.py b/docs/tutorials/wiki/src/authorization/tutorial/views/default.py
index 3a3b170e2..7ba99c65b 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/views/default.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/views/default.py
@@ -24,7 +24,7 @@ def view_wiki(context, request):
     return HTTPFound(location=request.resource_url(context, 'FrontPage'))
 
 
-@view_config(context='..models.Page', renderer='../templates/view.pt',
+@view_config(context='..models.Page', renderer='tutorial:templates/view.pt',
              permission='view')
 def view_page(context, request):
     wiki = context.__parent__
@@ -47,7 +47,7 @@ def view_page(context, request):
 
 
 @view_config(name='add_page', context='..models.Wiki',
-             renderer='../templates/edit.pt',
+             renderer='tutorial:templates/edit.pt',
              permission='edit')
 def add_page(context, request):
     pagename = request.subpath[0]
@@ -67,7 +67,7 @@ def add_page(context, request):
 
 
 @view_config(name='edit_page', context='..models.Page',
-             renderer='../templates/edit.pt',
+             renderer='tutorial:templates/edit.pt',
              permission='edit')
 def edit_page(context, request):
     if 'form.submitted' in request.params:
@@ -80,8 +80,8 @@ def edit_page(context, request):
 
 
 @view_config(context='..models.Wiki', name='login',
-             renderer='../templates/login.pt')
-@forbidden_view_config(renderer='../templates/login.pt')
+             renderer='tutorial:templates/login.pt')
+@forbidden_view_config(renderer='tutorial:templates/login.pt')
 def login(request):
     login_url = request.resource_url(request.context, 'login')
     referrer = request.url
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/views/notfound.py b/docs/tutorials/wiki/src/authorization/tutorial/views/notfound.py
index d44b4d0e6..dd0b00488 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/views/notfound.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/views/notfound.py
@@ -3,7 +3,7 @@ from pyramid.view import notfound_view_config
 from ..models import Page
 
 
-@notfound_view_config(renderer='../templates/404.pt')
+@notfound_view_config(renderer='tutorial:templates/404.pt')
 def notfound_view(request):
     request.response.status = 404
     pagename = request.path