Changeset 1641

Timestamp:

06/13/08 20:01:05 (5 months ago)

Author:

JensDiemer

Message:

solution for http://www.pylucid.org/phpBB2/viewtopic.php?p=1138#1138 & http://pylucid.net:8080/pylucid/ticket/87#comment:3

Files:

• trunk/pylucid/tests/install_section.py (modified) (6 diffs)

trunk/pylucid/tests/install_section.py

@@ -44 +44 @@
     install_url_base ="/%s" % settings.INSTALL_URL_PREFIX
 
-    def setUp(self):
-        settings.DEBUG = True
-
-    def test_prepare(self):
-        """
-        Check if there is no page.
-        """
-        self.failUnlessEqual(Page.objects.all().count(), 0)
-
 
 class TestNoPage(TestBase):
@@ -74 +65 @@
         return response
 
+    def test_no_page(self):
+        """
+        Check if there is no page.
+        """
+        self.failUnlessEqual(Page.objects.all().count(), 0)
+
     def test_page_request(self):
         """
@@ -191 +188 @@
 
 
-class TestMiddlewares:#(TestBase): #DEACTIVATED!
+class TestMiddlewares(TestBase):
     """
     Test the PyLucid common middleware.
@@ -198 +195 @@
     page with some informations.
 
-    FIXME: How we can delete the tables?
+    TODO: Should we find a faster was to run the test without existing database
+    tables?
     See: http://pylucid.org/phpBB2/viewtopic.php?p=1138#1138
 
@@ -205 +203 @@
     This messages comes from ./django/core/management/commands/flush.py
     """
-    def _rename_tables(self, old_prefix, new_prefix):
+    fixtures = [] # Run all test with a empty database
+
+    def _drop_all_tables(self):
+#        print "drop all tables...",
         from django.db import connection
-        from django.core.management.sql import table_list
+        from django.core.management.sql import table_names
 
         cursor = connection.cursor()
-        for table_name in table_list():
-            statement = (
-                "ALTER TABLE %(old_prefix)s%(name)s"
-                " RENAME TO %(new_prefix)s%(name)s;"
-            ) % {
-                "old_prefix": old_prefix,
-                "new_prefix": new_prefix,
-                "name": table_name,
-            }
+        for table_name in table_names():
+            statement = u"DROP TABLE %s;" % table_name
             cursor.execute(statement)
+#        print "done"
+
+    def _syncdb(self):
+#        print "syncdb...",
+        from django.core.management import call_command
+        call_command('syncdb', verbosity=0, interactive=False)
+#        print "done."
 
     def setUp(self):
-        self._rename_tables(old_prefix="", new_prefix="old_")
-
+        self._drop_all_tables()
+#
     def tearDown(self):
-        self._rename_tables(old_prefix="old_", new_prefix="")
+        self._syncdb()
 
     def test(self):
@@ -235 +236 @@
         self.assertResponse(response,
             must_contain=(
-                #"Can't get a database table",
+                "Can't get a database table.",
                 "solutions", "Please read the install guide",
             ),
-            #must_not_contain=("Error getting a cms page",)
+            must_not_contain=("Error getting a cms page",)
         )
 
     def test_install_section(self):
         """
-        Request the install section login. Without any database table, we should
-        be see the install secion login page.
-        """
-        self.assertInstallSectionLogin()
+        Request the install section login. Without any database table, we
+        should be see the install secion login page.
+        """
+#        self.assertInstallSectionLogin()
+        url = self.install_url_base
+        response = self.client.get(url)
+        self.failUnlessEqual(response.status_code, 200)
+        self.assertResponse(
+            response,
+            must_contain=("Login into the _install section",),
+        )