Removed populate tests from the SQL wiki tutorial

- Removed the main() settings parameter in populate.py
- Updated the Tests chapter

4 files changed, 4 insertions, 37 deletions

diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/scripts/populate.py b/docs/tutorials/wiki2/src/authorization/tutorial/scripts/populate.py
index 981adff38..03188e8ad 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/scripts/populate.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/scripts/populate.py
@@ -21,7 +21,7 @@ def usage(argv):
           '(example: "%s development.ini")' % (cmd, cmd)) 
     sys.exit(1)
 
-def main(argv=sys.argv, settings=None):
+def main(argv=sys.argv):
     if len(argv) != 2:
         usage(argv)
     config_uri = argv[1]
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/scripts/populate.py b/docs/tutorials/wiki2/src/tests/tutorial/scripts/populate.py
index de74f4d63..03188e8ad 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/scripts/populate.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/scripts/populate.py
@@ -21,13 +21,12 @@ def usage(argv):
           '(example: "%s development.ini")' % (cmd, cmd)) 
     sys.exit(1)
 
-def main(argv=sys.argv, settings=None):
+def main(argv=sys.argv):
     if len(argv) != 2:
         usage(argv)
     config_uri = argv[1]
-    if settings is None:
-        setup_logging(config_uri)
-        settings = get_appsettings(config_uri)
+    setup_logging(config_uri)
+    settings = get_appsettings(config_uri)
     engine = engine_from_config(settings, 'sqlalchemy.')
     DBSession.configure(bind=engine)
     Base.metadata.create_all(engine)
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/tests.py b/docs/tutorials/wiki2/src/tests/tutorial/tests.py
index 557d1b1be..c7b7d884b 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/tests.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/tests.py
@@ -246,23 +246,3 @@ class FunctionalTests(unittest.TestCase):
         self.testapp.get(self.editor_login, status=302)
         res = self.testapp.get('/FrontPage', status=200)
         self.assertTrue('FrontPage' in res.body)
-
-class Test_populate(unittest.TestCase):
-    def setUp(self):
-        from tutorial.models import DBSession
-        DBSession.remove()
-
-    def tearDown(self):
-        from tutorial.models import DBSession
-        DBSession.remove()
-
-    def _callFUT(self, settings):
-        from tutorial.scripts.populate import main
-        main(['foo', 'development.ini'], settings)
-
-    def test_it(self):
-        self._callFUT({'sqlalchemy.url':'sqlite://'})
-        from tutorial.models import DBSession, Page
-        self.assertEqual(DBSession.query(Page).one().data,
-            'This is the front page')
-
diff --git a/docs/tutorials/wiki2/tests.rst b/docs/tutorials/wiki2/tests.rst
index 94d97d2d5..92544404c 100644
--- a/docs/tutorials/wiki2/tests.rst
+++ b/docs/tutorials/wiki2/tests.rst
@@ -34,18 +34,6 @@ 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``
 ====================================================