From f0b9bb2ef958052ab9c9b414dbcfa653eca7b83e Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sat, 17 Mar 2012 17:44:42 +0000 Subject: [PATCH] Do not unconditionally add extra_tests when testing geodjango. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17761 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/runtests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/runtests.py b/tests/runtests.py index fb646219fb..f7db3411cd 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -152,7 +152,7 @@ def django_tests(verbosity, interactive, failfast, test_labels): # If GeoDjango is used, add it's tests that aren't a part of # an application (e.g., GEOS, GDAL, Distance objects). - if geodjango(settings): + if geodjango(settings) and (not test_labels or 'gis' in test_labels): from django.contrib.gis.tests import geodjango_suite extra_tests.append(geodjango_suite(apps=False))