From 6175ff659c2523974072b404636911ebb89c2d42 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Wed, 1 Jan 2020 20:15:20 -0800
Subject: Resync wiki/*.rst and related files after moving tests directory

---
 docs/tutorials/wiki/src/basiclayout/MANIFEST.in    |  3 +++
 docs/tutorials/wiki/src/basiclayout/pytest.ini     |  7 +++++--
 .../wiki/src/basiclayout/tests/__init__.py         |  0
 .../wiki/src/basiclayout/tests/test_it.py          | 24 ++++++++++++++++++++++
 .../wiki/src/basiclayout/tutorial/tests.py         | 24 ----------------------
 5 files changed, 32 insertions(+), 26 deletions(-)
 create mode 100644 docs/tutorials/wiki/src/basiclayout/tests/__init__.py
 create mode 100644 docs/tutorials/wiki/src/basiclayout/tests/test_it.py
 delete mode 100644 docs/tutorials/wiki/src/basiclayout/tutorial/tests.py

(limited to 'docs/tutorials/wiki/src/basiclayout')

diff --git a/docs/tutorials/wiki/src/basiclayout/MANIFEST.in b/docs/tutorials/wiki/src/basiclayout/MANIFEST.in
index 05cc195d9..b4624fd1c 100644
--- a/docs/tutorials/wiki/src/basiclayout/MANIFEST.in
+++ b/docs/tutorials/wiki/src/basiclayout/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/basiclayout/pytest.ini b/docs/tutorials/wiki/src/basiclayout/pytest.ini
index a3489cdf8..42c3259f9 100644
--- a/docs/tutorials/wiki/src/basiclayout/pytest.ini
+++ b/docs/tutorials/wiki/src/basiclayout/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/basiclayout/tests/__init__.py b/docs/tutorials/wiki/src/basiclayout/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/docs/tutorials/wiki/src/basiclayout/tests/test_it.py b/docs/tutorials/wiki/src/basiclayout/tests/test_it.py
new file mode 100644
index 000000000..6c72bcc62
--- /dev/null
+++ b/docs/tutorials/wiki/src/basiclayout/tests/test_it.py
@@ -0,0 +1,24 @@
+import unittest
+
+from pyramid import testing
+
+
+class ViewTests(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def test_my_view(self):
+        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/basiclayout/tutorial/tests.py b/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py
deleted file mode 100644
index aa5641cdd..000000000
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import unittest
-
-from pyramid import testing
-
-
-class ViewTests(unittest.TestCase):
-    def setUp(self):
-        self.config = testing.setUp()
-
-    def tearDown(self):
-        testing.tearDown()
-
-    def test_my_view(self):
-        from .views.default import my_view
-        request = testing.DummyRequest()
-        info = my_view(request)
-        self.assertEqual(info['project'], 'myproj')
-
-    def test_notfound_view(self):
-        from .views.notfound import notfound_view
-        request = testing.DummyRequest()
-        info = notfound_view(request)
-        self.assertEqual(info, {})
-
-- 
cgit v1.2.3