mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-25 22:56:12 +00:00
Code Issues 32 Releases Wiki Activity

[1.8.x] Fixed #24290 -- Skipped postgres_tests if not running with PostgreSQL.

Browse Source 
Backport of 8b39f33d78 from master
This commit is contained in:
Tim Graham
2015-02-16 18:10:35 -05:00
parent 730fb593ad
commit a00a0f8804
5 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/runtests.py
View File

@@ -85,7 +85,7 @@ def get_test_modules():
os.path.isfile(f) or
not os.path.exists(os.path.join(dirpath, f, '__init__.py'))):
continue
if not connection.vendor == 'postgresql' and f == 'postgres_tests' or f == 'postgres':
if connection.vendor != 'postgresql' and f == 'postgres_tests':
continue
modules.append((modpath, f))
return modules
@@ -232,6 +232,11 @@ def django_tests(verbosity, interactive, failfast, keepdb, reverse, test_labels,
state = setup(verbosity, test_labels)
extra_tests = []
if test_labels and 'postgres_tests' in test_labels and connection.vendor != 'postgres':
if verbosity >= 2:
print("Removed postgres_tests from tests as we're not running with PostgreSQL.")
test_labels.remove('postgres_tests')
# Run the test suite, including the extra validation tests.
if not hasattr(settings, 'TEST_RUNNER'):
settings.TEST_RUNNER = 'django.test.runner.DiscoverRunner'