From 5afff61b027613be4b7f72df61f46406f1678cc0 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Tue, 15 Dec 2009 17:58:04 +0000 Subject: [PATCH] [soc2009/multidb] Corrected some test errors introduced by merging trunk. Patch from Russell Keith-Magee. git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11870 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/fields/__init__.py | 1 + ...default.json => db_fixture_1.default.json} | 0 ...t.json.gz => db_fixture_2.default.json.gz} | Bin ...suchdb.json => db_fixture_3.nosuchdb.json} | 0 tests/modeltests/fixtures/models.py | 18 +++++++++--------- 5 files changed, 10 insertions(+), 9 deletions(-) rename tests/modeltests/fixtures/fixtures/{fixture6.default.json => db_fixture_1.default.json} (100%) rename tests/modeltests/fixtures/fixtures/{fixture7.default.json.gz => db_fixture_2.default.json.gz} (100%) rename tests/modeltests/fixtures/fixtures/{fixture8.nosuchdb.json => db_fixture_3.nosuchdb.json} (100%) diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index 5401269627..4b4d982b6b 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -1,5 +1,6 @@ import copy import datetime +import decimal import os import re import time diff --git a/tests/modeltests/fixtures/fixtures/fixture6.default.json b/tests/modeltests/fixtures/fixtures/db_fixture_1.default.json similarity index 100% rename from tests/modeltests/fixtures/fixtures/fixture6.default.json rename to tests/modeltests/fixtures/fixtures/db_fixture_1.default.json diff --git a/tests/modeltests/fixtures/fixtures/fixture7.default.json.gz b/tests/modeltests/fixtures/fixtures/db_fixture_2.default.json.gz similarity index 100% rename from tests/modeltests/fixtures/fixtures/fixture7.default.json.gz rename to tests/modeltests/fixtures/fixtures/db_fixture_2.default.json.gz diff --git a/tests/modeltests/fixtures/fixtures/fixture8.nosuchdb.json b/tests/modeltests/fixtures/fixtures/db_fixture_3.nosuchdb.json similarity index 100% rename from tests/modeltests/fixtures/fixtures/fixture8.nosuchdb.json rename to tests/modeltests/fixtures/fixtures/db_fixture_3.nosuchdb.json diff --git a/tests/modeltests/fixtures/models.py b/tests/modeltests/fixtures/models.py index e978c54d49..7fcf89d561 100644 --- a/tests/modeltests/fixtures/models.py +++ b/tests/modeltests/fixtures/models.py @@ -262,28 +262,28 @@ Multiple fixtures named 'fixture5' in '...fixtures'. Aborting. >>> management.call_command('flush', verbosity=0, interactive=False) -# Load fixtures 6 and 7. These will load using the 'default' database identifier implicitly ->>> management.call_command('loaddata', 'fixture6', verbosity=0) ->>> management.call_command('loaddata', 'fixture7', verbosity=0) +# Load db fixtures 1 and 2. These will load using the 'default' database identifier implicitly +>>> management.call_command('loaddata', 'db_fixture_1', verbosity=0) +>>> management.call_command('loaddata', 'db_fixture_2', verbosity=0) >>> Article.objects.all() [, , ] >>> management.call_command('flush', verbosity=0, interactive=False) -# Load fixtures 6 and 7. These will load using the 'default' database identifier explicitly ->>> management.call_command('loaddata', 'fixture6', verbosity=0, using='default') ->>> management.call_command('loaddata', 'fixture7', verbosity=0, using='default') +# Load db fixtures 1 and 2. These will load using the 'default' database identifier explicitly +>>> management.call_command('loaddata', 'db_fixture_1', verbosity=0, using='default') +>>> management.call_command('loaddata', 'db_fixture_2', verbosity=0, using='default') >>> Article.objects.all() [, , ] >>> management.call_command('flush', verbosity=0, interactive=False) -# Try to load fixture 8. This won't load because the database identifier doesn't match ->>> management.call_command('loaddata', 'fixture8', verbosity=0) +# Try to load db fixture 3. This won't load because the database identifier doesn't match +>>> management.call_command('loaddata', 'db_fixture_3', verbosity=0) >>> Article.objects.all() [] ->>> management.call_command('loaddata', 'fixture8', verbosity=0, using='default') +>>> management.call_command('loaddata', 'db_fixture_3', verbosity=0, using='default') >>> Article.objects.all() []