From 6d0328aa397b24189230c6938adcdde307dfba76 Mon Sep 17 00:00:00 2001 From: Patricio Paez Date: Thu, 13 Dec 2012 06:59:34 -0600 Subject: Make ZODB tutorial functional tests pass - Synchronize with the changes in pyramid_zodbdbconn in commit 64b0c468d4ae320d720d03d0cbc8e9a0b0e42f1f --- docs/tutorials/wiki/src/tests/tutorial/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/tutorials/wiki/src/tests/tutorial/tests.py b/docs/tutorials/wiki/src/tests/tutorial/tests.py index ff7ca4f33..c435a4519 100644 --- a/docs/tutorials/wiki/src/tests/tutorial/tests.py +++ b/docs/tutorials/wiki/src/tests/tutorial/tests.py @@ -143,7 +143,7 @@ class FunctionalTests(unittest.TestCase): 'pyramid.includes': ['pyramid_zodbconn', 'pyramid_tm'] } app = main({}, **settings) - self.db = app.registry.zodb_database + self.db = app.registry._zodb_databases[''] from webtest import TestApp self.testapp = TestApp(app) -- cgit v1.2.3 From 2a98712048133353392b9e725a24499acd48d605 Mon Sep 17 00:00:00 2001 From: Patricio Paez Date: Thu, 13 Dec 2012 07:08:23 -0600 Subject: Improvements to the ZODB tutorial Tests chapter - Standardize with the SQL tutorial --- docs/tutorials/wiki/tests.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/tutorials/wiki/tests.rst b/docs/tutorials/wiki/tests.rst index 46d009d0f..7a019dd04 100644 --- a/docs/tutorials/wiki/tests.rst +++ b/docs/tutorials/wiki/tests.rst @@ -17,8 +17,8 @@ We write tests for the model classes and the appmaker. Changing ``tests.py``, we'll write a separate test class for each model class, and we'll write a test class for the ``appmaker``. -To do so, we'll retain the ``tutorial.tests.ViewTests`` class provided as a -result of the ``zodb`` project generator. We'll add three test +To do so, we'll retain the ``tutorial.tests.ViewTests`` class that was +generated as part of the ``zodb`` scaffold. We'll add three test classes: one for the ``Page`` model named ``PageModelTests``, one for the ``Wiki`` model named ``WikiModelTests``, and one for the appmaker named ``AppmakerTests``. @@ -51,8 +51,8 @@ below: :linenos: :language: python -Run the Tests -============= +Running the Tests +================= We can run these tests by using ``setup.py test`` in the same way we did in :ref:`running_tests`. However, first we must edit our ``setup.py`` to @@ -63,6 +63,7 @@ Change the ``requires`` list in ``setup.py`` to include ``WebTest``. :linenos: :language: python :lines: 9-19 + :emphasize-lines: 10 After we've added a dependency on WebTest in ``setup.py``, we need to rerun ``setup.py develop`` to get WebTest installed into our virtualenv. Assuming -- cgit v1.2.3