Merge pull request #485 from ppaez/improve-docs

Improve docs

3 files changed, 4 insertions, 25 deletions

diff --git a/docs/tutorials/wiki2/src/tests/setup.py b/docs/tutorials/wiki2/src/tests/setup.py
index d05495fbd..0f58d8a18 100644
--- a/docs/tutorials/wiki2/src/tests/setup.py
+++ b/docs/tutorials/wiki2/src/tests/setup.py
@@ -41,6 +41,6 @@ setup(name='tutorial',
       [paste.app_factory]
       main = tutorial:main
       [console_scripts]
-      populate_tutorial = tutorial.scripts.populate:main
+      initialize_tutorial_db = tutorial.scripts.initializedb:main
       """,
       )
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/scripts/populate.py b/docs/tutorials/wiki2/src/tests/tutorial/scripts/initializedb.py
index de74f4d63..03188e8ad 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/scripts/populate.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/scripts/initializedb.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')
-