Merge branch 'master' into security-docs

9 files changed, 24 insertions, 9 deletions

diff --git a/docs/quick_tutorial/cookiecutters.rst b/docs/quick_tutorial/cookiecutters.rst
index e4a585a33..a1d60c181 100644
--- a/docs/quick_tutorial/cookiecutters.rst
+++ b/docs/quick_tutorial/cookiecutters.rst
@@ -73,8 +73,8 @@ Steps
 
     .. code-block:: text
 
-        Starting subprocess with file monitor
-        Starting server in PID 73732.
+        Starting monitor for PID 60461.
+        Starting server in PID 60461.
         Serving on http://localhost:6543
         Serving on http://localhost:6543
 
diff --git a/docs/quick_tutorial/cookiecutters/.coveragerc b/docs/quick_tutorial/cookiecutters/.coveragerc
index 1bcbb8c3e..8aa37b9e7 100644
--- a/docs/quick_tutorial/cookiecutters/.coveragerc
+++ b/docs/quick_tutorial/cookiecutters/.coveragerc
@@ -1,3 +1,2 @@
 [run]
 source = cc_starter
-omit = cc_starter/test*
diff --git a/docs/quick_tutorial/cookiecutters/MANIFEST.in b/docs/quick_tutorial/cookiecutters/MANIFEST.in
index 79c7ec16c..4071776f9 100644
--- a/docs/quick_tutorial/cookiecutters/MANIFEST.in
+++ b/docs/quick_tutorial/cookiecutters/MANIFEST.in
@@ -1,2 +1,5 @@
 include *.txt *.ini *.cfg *.rst
 recursive-include cc_starter *.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/quick_tutorial/cookiecutters/cc_starter/views/default.py b/docs/quick_tutorial/cookiecutters/cc_starter/views/default.py
index 47af359b5..21c30e0b2 100644
--- a/docs/quick_tutorial/cookiecutters/cc_starter/views/default.py
+++ b/docs/quick_tutorial/cookiecutters/cc_starter/views/default.py
@@ -1,6 +1,6 @@
 from pyramid.view import view_config
 
 
-@view_config(route_name='home', renderer='../templates/mytemplate.jinja2')
+@view_config(route_name='home', renderer='cc_starter:templates/mytemplate.jinja2')
 def my_view(request):
     return {'project': 'cc_starter'}
diff --git a/docs/quick_tutorial/cookiecutters/cc_starter/views/notfound.py b/docs/quick_tutorial/cookiecutters/cc_starter/views/notfound.py
index 69d6e2804..e8b8f26f3 100644
--- a/docs/quick_tutorial/cookiecutters/cc_starter/views/notfound.py
+++ b/docs/quick_tutorial/cookiecutters/cc_starter/views/notfound.py
@@ -1,7 +1,7 @@
 from pyramid.view import notfound_view_config
 
 
-@notfound_view_config(renderer='../templates/404.jinja2')
+@notfound_view_config(renderer='cc_starter:templates/404.jinja2')
 def notfound_view(request):
     request.response.status = 404
     return {}
diff --git a/docs/quick_tutorial/cookiecutters/pytest.ini b/docs/quick_tutorial/cookiecutters/pytest.ini
index a7bd797f0..515cc3cf0 100644
--- a/docs/quick_tutorial/cookiecutters/pytest.ini
+++ b/docs/quick_tutorial/cookiecutters/pytest.ini
@@ -1,3 +1,6 @@
 [pytest]
-testpaths = cc_starter
-python_files = *.py
+addopts = --strict
+
+testpaths =
+    cc_starter
+    tests
diff --git a/docs/quick_tutorial/cookiecutters/setup.py b/docs/quick_tutorial/cookiecutters/setup.py
index d5d3d018b..9c9d54e5b 100644
--- a/docs/quick_tutorial/cookiecutters/setup.py
+++ b/docs/quick_tutorial/cookiecutters/setup.py
@@ -37,7 +37,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/quick_tutorial/cookiecutters/tests/__init__.py b/docs/quick_tutorial/cookiecutters/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/docs/quick_tutorial/cookiecutters/tests/__init__.py
diff --git a/docs/quick_tutorial/cookiecutters/cc_starter/tests.py b/docs/quick_tutorial/cookiecutters/tests/test_it.py
index f3886be84..634abfdf2 100644
--- a/docs/quick_tutorial/cookiecutters/cc_starter/tests.py
+++ b/docs/quick_tutorial/cookiecutters/tests/test_it.py
@@ -11,11 +11,17 @@ class ViewTests(unittest.TestCase):
         testing.tearDown()
 
     def test_my_view(self):
-        from .views.default import my_view
+        from cc_starter.views.default import my_view
         request = testing.DummyRequest()
         info = my_view(request)
         self.assertEqual(info['project'], 'cc_starter')
 
+    def test_notfound_view(self):
+        from cc_starter.views.notfound import notfound_view
+        request = testing.DummyRequest()
+        info = notfound_view(request)
+        self.assertEqual(info, {})
+
 
 class FunctionalTests(unittest.TestCase):
     def setUp(self):
@@ -27,3 +33,7 @@ class FunctionalTests(unittest.TestCase):
     def test_root(self):
         res = self.testapp.get('/', status=200)
         self.assertTrue(b'Pyramid' in res.body)
+
+    def test_notfound(self):
+        res = self.testapp.get('/badurl', status=404)
+        self.assertTrue(res.status_code == 404)