From 61db8d6b970359b365fd8077f4a5895a0dd00aa0 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 19 Jun 2009 02:19:37 +0000 Subject: [PATCH] [soc2009/multidb] Updated testing documentation for the new settings, also updated the TODO git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11082 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- TODO.txt | 1 - docs/topics/testing.txt | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/TODO.txt b/TODO.txt index 1b9c08cf60..590599df46 100644 --- a/TODO.txt +++ b/TODO.txt @@ -9,7 +9,6 @@ that need to be done. I'm trying to be as granular as possible. ``settings.DATABASES``. This includes the following locations * ref/settings -- needs to be upddated for TEST_* - * topics/testing -- needs update for the TEST_* settings, plus test refactor The remaining items will be fixed as the code for them enters the code base. diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt index 3fb1b556a4..6ef086b1ba 100644 --- a/docs/topics/testing.txt +++ b/docs/topics/testing.txt @@ -287,8 +287,8 @@ By default this test database gets its name by prepending ``test_`` to the value of the ``DATABASE_NAME`` setting. When using the SQLite database engine the tests will by default use an in-memory database (i.e., the database will be created in memory, bypassing the filesystem entirely!). If you want to -use a different database name, specify the :setting:`TEST_DATABASE_NAME` -setting. +use a different database name, specify ``TEST_DATABASE_NAME`` in the dictionary +for any given database in :setting:`DATABASES`. Aside from using a separate database, the test runner will otherwise use all of the same database settings you have in your settings file: @@ -301,8 +301,8 @@ account has sufficient privileges to create a new database on the system. For fine-grained control over the character encoding of your test database, use the -:setting:`TEST_DATABASE_CHARSET` setting. If you're using MySQL, you can also -use the :setting:`TEST_DATABASE_COLLATION` setting to control the particular +``TEST_DATABASE_CHARSET`` option. If you're using MySQL, you can also +use the ``TEST_DATABASE_COLLATION`` option to control the particular collation used by the test database. See the :ref:`settings documentation ` for details of these advanced settings.