Permalink
Browse files

Fixed #2916 -- Moved syncdb call out of simple test runner and into c…

…reate_test_db, to match documentation and simplify testing process for people using other test frameworks. Thanks, remco@diji.biz.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 895633a commit fb509ee8d3c67efd28beef2df463b62ef883c17a @freakboy3742 freakboy3742 committed Feb 18, 2007
Showing with 4 additions and 2 deletions.
  1. +1 −0 AUTHORS
  2. +0 −2 django/test/simple.py
  3. +3 −0 django/test/utils.py
View
1 AUTHORS
@@ -154,6 +154,7 @@ answer newbie questions, and generally made Django that much better:
Michael Radziej <mir@noris.de>
ramiro
Brian Ray <http://brianray.chipy.org/>
+ remco@diji.biz
rhettg@gmail.com
Oliver Rutherfurd <http://rutherfurd.net/>
Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
View
2 django/test/simple.py
@@ -1,6 +1,5 @@
import unittest, doctest
from django.conf import settings
-from django.core import management
from django.test.utils import setup_test_environment, teardown_test_environment
from django.test.utils import create_test_db, destroy_test_db
from django.test.testcases import OutputChecker, DocTestRunner
@@ -78,7 +77,6 @@ def run_tests(module_list, verbosity=1, extra_tests=[]):
old_name = settings.DATABASE_NAME
create_test_db(verbosity)
- management.syncdb(verbosity, interactive=False)
unittest.TextTestRunner(verbosity=verbosity).run(suite)
destroy_test_db(old_name, verbosity)
View
3 django/test/utils.py
@@ -1,6 +1,7 @@
import sys, time
from django.conf import settings
from django.db import connection, transaction, backend
+from django.core import management
from django.dispatch import dispatcher
from django.test import signals
from django.template import Template
@@ -84,6 +85,8 @@ def create_test_db(verbosity=1, autoclobber=False):
connection.close()
settings.DATABASE_NAME = TEST_DATABASE_NAME
+ management.syncdb(verbosity, interactive=False)
+
# Get a cursor (even though we don't need one yet). This has
# the side effect of initializing the test database.
cursor = connection.cursor()

0 comments on commit fb509ee

Please sign in to comment.