innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Corrected a few missed references to old test settings

This commit is contained in:
Shai Berger 2014-03-09 08:33:33 +02:00
parent 40afdaf08c
commit 0615eaf24a
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/topics/testing/overview.txt
View File

@ -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 the tests will by default use an in-memory database (i.e., the
database will be created in memory, bypassing the filesystem database will be created in memory, bypassing the filesystem
entirely!). If you want to use a different database name, specify entirely!). If you want to use a different database name, specify
:setting:`TEST_NAME` in the dictionary for any given database in :setting:`NAME <TEST_NAME>` in the :setting:`TEST <DATABASE-TEST>`
:setting:`DATABASES`. dictionary for any given database in :setting:`DATABASES`.
Aside from using a separate database, the test runner will otherwise Aside from using a separate database, the test runner will otherwise
use all of the same database settings you have in your settings file: 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. create a new database on the system.
For fine-grained control over the character encoding of your test For fine-grained control over the character encoding of your test
database, use the :setting:`TEST_CHARSET` option. If you're using database, use the :setting:`CHARSET <TEST_CHARSET>` TEST option. If you're using
MySQL, you can also use the :setting:`TEST_COLLATION` option to MySQL, you can also use the :setting:`COLLATION <TEST_COLLATION>` option to
control the particular collation used by the test database. See the control the particular collation used by the test database. See the
:doc:`settings documentation </ref/settings>` for details of these :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? .. admonition:: Finding data from your production database when running tests?

2
tests/requests/tests.py
View File

@ -699,7 +699,7 @@ class HostValidationTests(SimpleTestCase):
@skipIf(connection.vendor == 'sqlite' @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.") "Cannot establish two connections to an in-memory SQLite database.")
class DatabaseConnectionHandlingTests(TransactionTestCase): class DatabaseConnectionHandlingTests(TransactionTestCase):

2
tests/transactions_regress/tests.py
View File

@ -195,7 +195,7 @@ class TestTransactionClosing(IgnoreDeprecationWarningsMixin, TransactionTestCase
@skipIf(connection.vendor == 'sqlite' @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.") "Cannot establish two connections to an in-memory SQLite database.")
class TestNewConnection(IgnoreDeprecationWarningsMixin, TransactionTestCase): class TestNewConnection(IgnoreDeprecationWarningsMixin, TransactionTestCase):
""" """