From 8a8f99ab68b958a9382fc607a0cfe5c9b038d394 Mon Sep 17 00:00:00 2001 From: joke2k Date: Thu, 17 Apr 2014 16:22:31 +0200 Subject: [PATCH] add *.pyc to .gitignore; remove repeated INSTALLED_APPS from test_project.settings; fix check dj-database-url returned None values to empty string --- .gitignore | 3 ++- test_project/test_project/settings.py | 14 -------------- tests/test_values.py | 8 ++++---- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 4401d89..636d3f0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ docs/_build *.egg test.db build/ -.tox/ \ No newline at end of file +.tox/ +*.pyc diff --git a/test_project/test_project/settings.py b/test_project/test_project/settings.py index 334cee6..1ffe526 100644 --- a/test_project/test_project/settings.py +++ b/test_project/test_project/settings.py @@ -160,20 +160,6 @@ class Base(Configuration): } } - INSTALLED_APPS = ( - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.messages', - 'django.contrib.staticfiles', - # Uncomment the next line to enable the admin: - # 'django.contrib.admin', - # Uncomment the next line to enable admin documentation: - # 'django.contrib.admindocs', - 'configurations', - ) - class Debug(Base): YEAH = True diff --git a/tests/test_values.py b/tests/test_values.py index ad1ed90..314529d 100644 --- a/tests/test_values.py +++ b/tests/test_values.py @@ -246,11 +246,11 @@ class ValueTests(TestCase): self.assertEqual(value.setup('DATABASE_URL'), { 'default': { 'ENGINE': 'django.db.backends.sqlite3', - 'HOST': None, + 'HOST': '', 'NAME': ':memory:', - 'PASSWORD': None, - 'PORT': None, - 'USER': None, + 'PASSWORD': '', + 'PORT': '', + 'USER': '', }}) def test_email_url_value(self):