Refactored database switching code to separate file; updated it to work with Django 1.1

 - Legacy-Id: 1702

Author: pasieronen

ietf/tests.py

@@ -2,6 +2,7 @@
 
 import os
 import re
+import sys
 import traceback
 import urllib2 as urllib
 import httplib
@@ -19,6 +20,7 @@
 from django.core import management
 import ietf.urls
 from ietf.utils import log
+from ietf.utils.test_utils import RealDatabaseTest
 
 # This is needed so that "manage.py test ietf.UrlTestCase" works
 if django.VERSION[0] > 0:
@@ -30,6 +32,7 @@
     ietf.models = types.ModuleType('ietf.models')
     # Fixture loading code uses the directory of this file, not the actual file
     ietf.models.__file__ = ietf.settings.__file__
+    sys.modules['ietf.models'] = ietf.models
 
 
 startup_database = settings.DATABASE_NAME  # The startup database name, before changing to test_...
@@ -255,7 +258,7 @@ def module_setup(module):
     settings.DATABASE_NAME = module.testdb
     connection.cursor()
 
-class UrlTestCase(TestCase):
+class UrlTestCase(TestCase,RealDatabaseTest):
 
     def __init__(self, *args, **kwargs):
         TestCase.__init__(self, *args, **kwargs)
@@ -265,17 +268,10 @@ def __init__(self, *args, **kwargs):
 
     def setUp(self):
         self.client = Client()
-
-        self.testdb = settings.DATABASE_NAME
-        connection.close()
-        settings.DATABASE_NAME = startup_database
-        connection.cursor()
+        self.setUpRealDatabase()
 
     def tearDown(self):
-        # Revert to using the test database
-        connection.close()
-        settings.DATABASE_NAME = self.testdb
-        connection.cursor()
+        self.tearDownRealDatabase()
 
 # ------------------------------------------------------------------------------
 # Test methods.

ietf/utils/test_utils.py

@@ -0,0 +1,63 @@
+# Copyright The IETF Trust 2007, All Rights Reserved
+
+# Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#  * Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  * Redistributions in binary form must reproduce the above
+#    copyright notice, this list of conditions and the following
+#    disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#
+#  * Neither the name of the Nokia Corporation and/or its
+#    subsidiary(-ies) nor the names of its contributors may be used
+#    to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import django
+from django.db import connection
+import ietf
+
+class RealDatabaseTest:
+    def setUpRealDatabase(self):
+        self._original_testdb = self._getDatabaseName()
+        newdb = ietf.settings.DATABASE_NAME
+        print "Switching database from "+self._original_testdb+" to "+newdb
+        self._setDatabaseName(newdb)
+
+    def tearDownRealDatabase(self):
+        curdb = self._getDatabaseName()
+        print "Switching database from "+curdb+" to "+self._original_testdb
+        self._setDatabaseName(self._original_testdb)
+
+    def _getDatabaseName(self):
+        if django.VERSION[0] == 0:
+            return django.conf.settings.DATABASE_NAME 
+        else:
+            return connection.settings_dict['DATABASE_NAME'] 
+
+    def _setDatabaseName(self, name):        
+        connection.close()
+        if django.VERSION[0] == 0:
+            django.conf.settings.DATABASE_NAME = name
+        else:
+            connection.settings_dict['DATABASE_NAME'] = name
+        connection.cursor()