Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed runtests.py problem from [3177] where it assumed you were runni…

…ng the tests from within the tests directory

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3181 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 0e92f706025606e27fb4a7fd593914b172f84c76 1 parent 5f47161
@adrianholovaty adrianholovaty authored
Showing with 6 additions and 6 deletions.
  1. +6 −6 tests/runtests.py
View
12 tests/runtests.py
@@ -24,7 +24,7 @@ def log_error(model_name, title, description):
ALWAYS_INSTALLED_APPS = [
'django.contrib.contenttypes',
- 'django.contrib.auth',
+ 'django.contrib.auth',
'django.contrib.sites',
'django.contrib.flatpages',
'django.contrib.redirects',
@@ -35,8 +35,8 @@ def log_error(model_name, title, description):
def get_test_models():
models = []
- for loc in MODEL_TESTS_DIR_NAME, REGRESSION_TESTS_DIR_NAME:
- for f in os.listdir(loc):
+ for loc, dirpath in (MODEL_TESTS_DIR_NAME, MODEL_TEST_DIR), (REGRESSION_TESTS_DIR_NAME, REGRESSION_TEST_DIR):
+ for f in os.listdir(dirpath):
if f.startswith('__init__') or f.startswith('.') or f.startswith('sql'):
continue
models.append((loc, f))
@@ -139,7 +139,7 @@ def run_tests(self):
TEST_DATABASE_NAME = ":memory:"
else:
# Create the test database and connect to it. We need to autocommit
- # if the database supports it because PostgreSQL doesn't allow
+ # if the database supports it because PostgreSQL doesn't allow
# CREATE/DROP DATABASE statements within transactions.
cursor = connection.cursor()
self._set_autocommit(connection)
@@ -161,7 +161,7 @@ def run_tests(self):
# Initialize the test database.
cursor = connection.cursor()
-
+
# Install the core always installed apps
for app in ALWAYS_INSTALLED_APPS:
self.output(1, "Installing contrib app %s" % app)
@@ -265,7 +265,7 @@ def run_tests(self):
print "%s error%s:" % (len(error_list), len(error_list) != 1 and 's' or '')
else:
print "All tests passed."
-
+
def _set_autocommit(self, connection):
"""
Make sure a connection is in autocommit mode.
Please sign in to comment.
Something went wrong with that request. Please try again.