summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-12-01 21:58:51 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-12-01 21:58:51 +0000
commitb3db18817a4034f0af0219b3436c1ceccf61789d (patch)
tree1a5b2b785e49a2bbc0eca4cc7519e2481cb700e9
parenta72324bf7f001f163aa75b73d7eb3e7601c29b60 (diff)
Fixed #5979 -- Always use SITE_ID=1 when running Django's core tests. This
makes things much easier. Thanks, George Vilches. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rwxr-xr-xtests/runtests.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/runtests.py b/tests/runtests.py
index 843850074b..2d3b737cec 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -107,8 +107,7 @@ def django_tests(verbosity, interactive, test_labels):
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.middleware.common.CommonMiddleware',
)
- if not hasattr(settings, 'SITE_ID'):
- settings.SITE_ID = 1
+ settings.SITE_ID = 1
# Load all the ALWAYS_INSTALLED_APPS.
# (This import statement is intentionally delayed until after we