8 files changed, 32 insertions, 26 deletions
diff --git a/docs/tutorials/wiki2/src/tests/MANIFEST.in b/docs/tutorials/wiki2/src/tests/MANIFEST.in
index 05cc195d9..b4624fd1c 100644
--- a/docs/tutorials/wiki2/src/tests/MANIFEST.in
+++ b/docs/tutorials/wiki2/src/tests/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/wiki2/src/tests/pytest.ini b/docs/tutorials/wiki2/src/tests/pytest.ini
index a3489cdf8..42c3259f9 100644
--- a/docs/tutorials/wiki2/src/tests/pytest.ini
+++ b/docs/tutorials/wiki2/src/tests/pytest.ini
@@ -1,3 +1,6 @@
 [pytest]
-testpaths = tutorial
-python_files = test*.py
+addopts = --strict
+
+testpaths =
+    tutorial
+    tests
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/tests/__init__.py b/docs/tutorials/wiki2/src/tests/tests/__init__.py
index e69de29bb..e69de29bb 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/tests/__init__.py
+++ b/docs/tutorials/wiki2/src/tests/tests/__init__.py
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/tests/test_functional.py b/docs/tutorials/wiki2/src/tests/tests/test_functional.py
index 0250e71c9..0250e71c9 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/tests/test_functional.py
+++ b/docs/tutorials/wiki2/src/tests/tests/test_functional.py
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/tests/test_initdb.py b/docs/tutorials/wiki2/src/tests/tests/test_initdb.py
index 72fbff04b..9a24f0b22 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/tests/test_initdb.py
+++ b/docs/tutorials/wiki2/src/tests/tests/test_initdb.py
@@ -5,12 +5,12 @@ import unittest
 class TestInitializeDB(unittest.TestCase):
 
     def test_usage(self):
-        from ..scripts.initialize_db import main
+        from tutorial.scripts.initialize_db import main
         with self.assertRaises(SystemExit):
             main(argv=['foo'])
 
     def test_run(self):
-        from ..scripts.initialize_db import main
+        from tutorial.scripts.initialize_db import main
         main(argv=['foo', 'development.ini'])
         self.assertTrue(os.path.exists('tutorial.sqlite'))
         os.remove('tutorial.sqlite')
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/tests/test_security.py b/docs/tutorials/wiki2/src/tests/tests/test_security.py
index cbec6420d..9a1455ef9 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/tests/test_security.py
+++ b/docs/tutorials/wiki2/src/tests/tests/test_security.py
@@ -8,16 +8,16 @@ class TestMyAuthenticationPolicy(unittest.TestCase):
         request = DummyRequest()
         request.user = None
 
-        from ..security import MyAuthenticationPolicy
+        from tutorial.security import MyAuthenticationPolicy
         policy = MyAuthenticationPolicy(None)
         self.assertEqual(policy.authenticated_userid(request), None)
 
     def test_authenticated_user(self):
-        from ..models import User
+        from tutorial.models import User
         request = DummyRequest()
         request.user = User()
         request.user.id = 'foo'
 
-        from ..security import MyAuthenticationPolicy
+        from tutorial.security import MyAuthenticationPolicy
         policy = MyAuthenticationPolicy(None)
         self.assertEqual(policy.authenticated_userid(request), 'foo')
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/tests/test_user_model.py b/docs/tutorials/wiki2/src/tests/tests/test_user_model.py
index 9490ac990..21904da6b 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/tests/test_user_model.py
+++ b/docs/tutorials/wiki2/src/tests/tests/test_user_model.py
@@ -7,12 +7,12 @@ from pyramid import testing
 class BaseTest(unittest.TestCase):
 
     def setUp(self):
-        from ..models import get_tm_session
+        from tutorial.models import get_tm_session
         self.config = testing.setUp(settings={
             'sqlalchemy.url': 'sqlite:///:memory:'
         })
-        self.config.include('..models')
-        self.config.include('..routes')
+        self.config.include('tutorial.models')
+        self.config.include('tutorial.routes')
 
         session_factory = self.config.registry['dbsession_factory']
         self.session = get_tm_session(session_factory, transaction.manager)
@@ -20,7 +20,7 @@ class BaseTest(unittest.TestCase):
         self.init_database()
 
     def init_database(self):
-        from ..models.meta import Base
+        from tutorial.models.meta import Base
         session_factory = self.config.registry['dbsession_factory']
         engine = session_factory.kw['bind']
         Base.metadata.create_all(engine)
@@ -30,7 +30,7 @@ class BaseTest(unittest.TestCase):
         transaction.abort()
 
     def makeUser(self, name, role):
-        from ..models import User
+        from tutorial.models import User
         return User(name=name, role=role)
 
 
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/tests/test_views.py b/docs/tutorials/wiki2/src/tests/tests/test_views.py
index 2c945ab33..5c17457dd 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/tests/test_views.py
+++ b/docs/tutorials/wiki2/src/tests/tests/test_views.py
@@ -10,12 +10,12 @@ def dummy_request(dbsession):
 
 class BaseTest(unittest.TestCase):
     def setUp(self):
-        from ..models import get_tm_session
+        from tutorial.models import get_tm_session
         self.config = testing.setUp(settings={
             'sqlalchemy.url': 'sqlite:///:memory:'
         })
-        self.config.include('..models')
-        self.config.include('..routes')
+        self.config.include('tutorial.models')
+        self.config.include('tutorial.routes')
 
         session_factory = self.config.registry['dbsession_factory']
         self.session = get_tm_session(session_factory, transaction.manager)
@@ -23,7 +23,7 @@ class BaseTest(unittest.TestCase):
         self.init_database()
 
     def init_database(self):
-        from ..models.meta import Base
+        from tutorial.models.meta import Base
         session_factory = self.config.registry['dbsession_factory']
         engine = session_factory.kw['bind']
         Base.metadata.create_all(engine)
@@ -33,20 +33,20 @@ class BaseTest(unittest.TestCase):
         transaction.abort()
 
     def makeUser(self, name, role, password='dummy'):
-        from ..models import User
+        from tutorial.models import User
         user = User(name=name, role=role)
         user.set_password(password)
         return user
 
     def makePage(self, name, data, creator):
-        from ..models import Page
+        from tutorial.models import Page
         return Page(name=name, data=data, creator=creator)
 
 
 class ViewWikiTests(unittest.TestCase):
     def setUp(self):
         self.config = testing.setUp()
-        self.config.include('..routes')
+        self.config.include('tutorial.routes')
 
     def tearDown(self):
         testing.tearDown()
@@ -67,7 +67,7 @@ class ViewPageTests(BaseTest):
         return view_page(request)
 
     def test_it(self):
-        from ..routes import PageResource
+        from tutorial.routes import PageResource
 
         # add a page to the db
         user = self.makeUser('foo', 'editor')
@@ -99,8 +99,8 @@ class AddPageTests(BaseTest):
         return add_page(request)
 
     def test_it_pageexists(self):
-        from ..models import Page
-        from ..routes import NewPage
+        from tutorial.models import Page
+        from tutorial.routes import NewPage
         request = testing.DummyRequest({'form.submitted': True,
                                         'body': 'Hello yo!'},
                                        dbsession=self.session)
@@ -111,7 +111,7 @@ class AddPageTests(BaseTest):
         self.assertGreater(pagecount, 0)
 
     def test_it_notsubmitted(self):
-        from ..routes import NewPage
+        from tutorial.routes import NewPage
         request = dummy_request(self.session)
         request.user = self.makeUser('foo', 'editor')
         request.context = NewPage('AnotherPage')
@@ -121,8 +121,8 @@ class AddPageTests(BaseTest):
                          'http://example.com/add_page/AnotherPage')
 
     def test_it_submitted(self):
-        from ..models import Page
-        from ..routes import NewPage
+        from tutorial.models import Page
+        from tutorial.routes import NewPage
         request = testing.DummyRequest({'form.submitted': True,
                                         'body': 'Hello yo!'},
                                        dbsession=self.session)
@@ -139,7 +139,7 @@ class EditPageTests(BaseTest):
         return edit_page(request)
 
     def makeContext(self, page):
-        from ..routes import PageResource
+        from tutorial.routes import PageResource
         return PageResource(page)
 
     def test_it_notsubmitted(self):