Merge branch 'master' into improve-docs

1 files changed, 12 insertions, 0 deletions

diff --git a/docs/tutorials/wiki2/tests.rst b/docs/tutorials/wiki2/tests.rst
index 92544404c..94d97d2d5 100644
--- a/docs/tutorials/wiki2/tests.rst
+++ b/docs/tutorials/wiki2/tests.rst
@@ -34,6 +34,18 @@ tested in the unit tests, like logging in, logging out, checking that
 the ``viewer`` user cannot add or edit pages, but the ``editor`` user
 can, and so on.
 
+We must first modify ``main()`` in ``scripts/populate.py``, adding an
+optional ``settings`` argument so we can pass in a URI to a
+memory-resident database instead of our disk-based database we've
+populated; this allows us to run our tests with a clean database each
+time.  Replace ``main()`` with this version which adds an argument and
+then uses it if set, and creates a ``Model`` for testing:
+
+.. literalinclude:: src/tests/tutorial/scripts/populate.py
+   :lines: 24-36
+   :linenos:
+   :language: python
+
 Viewing the results of all our edits to ``tests.py``
 ====================================================