Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Corrected a few missed references to old test settings

  • Loading branch information...
commit 0615eaf24ad42e22873915bf8c1f5aca824d62c4 1 parent 40afdaf
@shaib shaib authored
View
16 docs/topics/testing/overview.txt
@@ -170,8 +170,8 @@ defined in :setting:`DATABASES`. 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
-:setting:`TEST_NAME` in the dictionary for any given database in
-:setting:`DATABASES`.
+:setting:`NAME <TEST_NAME>` in the :setting:`TEST <DATABASE-TEST>`
+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:
@@ -181,11 +181,17 @@ need to make sure that the given user 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_CHARSET` option. If you're using
-MySQL, you can also use the :setting:`TEST_COLLATION` option to
+database, use the :setting:`CHARSET <TEST_CHARSET>` TEST option. If you're using
+MySQL, you can also use the :setting:`COLLATION <TEST_COLLATION>` option to
control the particular collation used by the test database. See the
:doc:`settings documentation </ref/settings>` for details of these
-advanced settings.
+and other advanced settings.
+
+.. versionchanged:: 1.7
+
+ The different options in the :setting:`TEST <DATABASE-TEST>` database
+ setting used to be separate options in the database settings dictionary,
+ prefixed with ``TEST_``.
.. admonition:: Finding data from your production database when running tests?
View
2  tests/requests/tests.py
@@ -699,7 +699,7 @@ def test_get_host_suggestion_of_allowed_host(self):
@skipIf(connection.vendor == 'sqlite'
- and connection.settings_dict['TEST_NAME'] in (None, '', ':memory:'),
+ and connection.settings_dict['TEST']['NAME'] in (None, '', ':memory:'),
"Cannot establish two connections to an in-memory SQLite database.")
class DatabaseConnectionHandlingTests(TransactionTestCase):
View
2  tests/transactions_regress/tests.py
@@ -195,7 +195,7 @@ def test_failing_query_transaction_closed_debug(self):
@skipIf(connection.vendor == 'sqlite'
- and connection.settings_dict['TEST_NAME'] in (None, '', ':memory:'),
+ and connection.settings_dict['TEST']['NAME'] in (None, '', ':memory:'),
"Cannot establish two connections to an in-memory SQLite database.")
class TestNewConnection(IgnoreDeprecationWarningsMixin, TransactionTestCase):
"""

0 comments on commit 0615eaf

Please sign in to comment.
Something went wrong with that request. Please try again.