fix tests

doismellburning · Apr 30, 2012 · 233df5d · 233df5d
1 parent 3757960
commit 233df5d
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 255 deletions.
diff --git a/bin/steps/django b/bin/steps/django
@@ -21,50 +21,14 @@ fi
 echo "-----> Injecting Django settings..."
 
 
-SETTINGS_FILE=$(find . -maxdepth 3 -type f -name 'settings.py' | head -1)
+SETTINGS_FILE=$(find . -maxdepth 2 -type f -name 'settings.py' | head -1)
 PROJECT=$(dirname $SETTINGS_FILE)
 
 echo "Injecting code into $SETTINGS_FILE to read from DATABASE_URL" | indent
 
 cat >>$SETTINGS_FILE <<EOF
 
-import os
-import sys
-import urlparse
-
-# Register database schemes in URLs.
-urlparse.uses_netloc.append('postgres')
-urlparse.uses_netloc.append('mysql')
-
-try:
-
-    # Check to make sure DATABASES is set in settings.py file.
-    # If not default to {}
-
-    if 'DATABASES' not in locals():
-        DATABASES = {}
-
-    if 'DATABASE_URL' in os.environ:
-        url = urlparse.urlparse(os.environ['DATABASE_URL'])
-
-        # Ensure default database exists.
-        DATABASES['default'] = DATABASES.get('default', {})
-
-        # Update with environment configuration.
-        DATABASES['default'].update({
-            'NAME': url.path[1:],
-            'USER': url.username,
-            'PASSWORD': url.password,
-            'HOST': url.hostname,
-            'PORT': url.port,
-        })
-        if url.scheme == 'postgres':
-            DATABASES['default']['ENGINE'] = 'django.db.backends.postgresql_psycopg2'
-
-        if url.scheme == 'mysql':
-            DATABASES['default']['ENGINE'] = 'django.db.backends.mysql'
-except Exception:
-    print 'Unexpected error:', sys.exc_info()
+import dj_database_url
 
 EOF
 
diff --git a/bin/test b/bin/test
@@ -56,12 +56,6 @@ testDetectNotPython() {
   assertEquals "1" "${RETURN}"
 }
 
-testDetectDjangoWithMultipleRequirements() {
-  detect "multiple-requirements"
-  assertCapturedEquals "Python/Django"
-  assertCapturedSuccess
-}
-
 
 ## utils ########################################
 

diff --git a/test/django-1.4-skeleton/haystack/.DS_Store b/test/django-1.4-skeleton/haystack/.DS_Store
diff --git a/....4-skeleton/haystack/haystack/__init__.py → .../django-1.4-skeleton/haystack/__init__.py b/....4-skeleton/haystack/haystack/__init__.py → .../django-1.4-skeleton/haystack/__init__.py
diff --git a/....4-skeleton/haystack/haystack/settings.py → .../django-1.4-skeleton/haystack/settings.py b/....4-skeleton/haystack/haystack/settings.py → .../django-1.4-skeleton/haystack/settings.py
diff --git a/...go-1.4-skeleton/haystack/haystack/urls.py → test/django-1.4-skeleton/haystack/urls.py b/...go-1.4-skeleton/haystack/haystack/urls.py → test/django-1.4-skeleton/haystack/urls.py
diff --git a/...go-1.4-skeleton/haystack/haystack/wsgi.py → test/django-1.4-skeleton/haystack/wsgi.py b/...go-1.4-skeleton/haystack/haystack/wsgi.py → test/django-1.4-skeleton/haystack/wsgi.py
diff --git a/test/django-1.4-skeleton/haystack/manage.py → test/django-1.4-skeleton/manage.py b/test/django-1.4-skeleton/haystack/manage.py → test/django-1.4-skeleton/manage.py
diff --git a/test/multiple-requirements/haystack/haystack/__init__.py b/test/multiple-requirements/haystack/haystack/__init__.py
diff --git a/test/multiple-requirements/haystack/haystack/settings.py b/test/multiple-requirements/haystack/haystack/settings.py
diff --git a/test/multiple-requirements/haystack/haystack/urls.py b/test/multiple-requirements/haystack/haystack/urls.py
diff --git a/test/multiple-requirements/haystack/haystack/wsgi.py b/test/multiple-requirements/haystack/haystack/wsgi.py
diff --git a/test/multiple-requirements/haystack/manage.py b/test/multiple-requirements/haystack/manage.py
diff --git a/test/multiple-requirements/haystack/requirements.txt b/test/multiple-requirements/haystack/requirements.txt
diff --git a/test/multiple-requirements/requirements.txt b/test/multiple-requirements/requirements.txt