Permalink
Browse files

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
  • Loading branch information...
1 parent 6974886 commit f0b9bb2ef958052ab9c9b414dbcfa653eca7b83e @claudep claudep committed Mar 17, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 tests/runtests.py
View
2 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))

0 comments on commit f0b9bb2

Please sign in to comment.