[Python-modules-commits] r11019 - in packages/python-django/branches/experimental/debian (3 files)

[lamby at users.alioth.debian.org]

    Date: Wednesday, January 6, 2010 @ 15:31:09
  Author: lamby
Revision: 11019

Update dh_auto_test - database engine is set differently in 1.2.

Added:
  packages/python-django/branches/experimental/debian/test_settings.py
Modified:
  packages/python-django/branches/experimental/debian/changelog
  packages/python-django/branches/experimental/debian/rules

Modified: packages/python-django/branches/experimental/debian/changelog
===================================================================
--- packages/python-django/branches/experimental/debian/changelog	2010-01-06 15:31:03 UTC (rev 11018)
+++ packages/python-django/branches/experimental/debian/changelog	2010-01-06 15:31:09 UTC (rev 11019)
@@ -13,6 +13,7 @@
   * Update "02-embedded_code_copies.diff".
   * Remove "05_ftbfs_in_november.diff" - applied upstream.
   * Remove "06_python_2.6.3_regression.diff" - applied upstream.
+  * Update dh_auto_test - database engine is set differently in 1.2.
 
  -- Chris Lamb <lamby at debian.org>  Wed, 06 Jan 2010 11:21:56 +0000
 

Modified: packages/python-django/branches/experimental/debian/rules
===================================================================
--- packages/python-django/branches/experimental/debian/rules	2010-01-06 15:31:03 UTC (rev 11018)
+++ packages/python-django/branches/experimental/debian/rules	2010-01-06 15:31:09 UTC (rev 11019)
@@ -25,7 +25,7 @@
 
 override_dh_auto_test:
 	PYTHONPATH=. django/bin/django-admin.py startproject testproject
-	sed -i "s|DATABASE_ENGINE = ''|DATABASE_ENGINE = 'sqlite3'|" testproject/settings.py
+	cat debian/test_settings.py >> testproject/settings.py
 	PYTHONPATH=. tests/runtests.py --settings=testproject.settings --verbosity=2
 
 override_dh_install:

Added: packages/python-django/branches/experimental/debian/test_settings.py
===================================================================
--- packages/python-django/branches/experimental/debian/test_settings.py	                        (rev 0)
+++ packages/python-django/branches/experimental/debian/test_settings.py	2010-01-06 15:31:09 UTC (rev 11019)
@@ -0,0 +1,18 @@
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': '',                      # Or path to database file if using sqlite3.
+        'USER': '',                      # Not used with sqlite3.
+        'PASSWORD': '',                  # Not used with sqlite3.
+        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
+    },
+    'other': {
+        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': '',                      # Or path to database file if using sqlite3.
+        'USER': '',                      # Not used with sqlite3.
+        'PASSWORD': '',                  # Not used with sqlite3.
+        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
+    },
+}