mirror of
https://github.com/django/django.git
synced 2025-09-26 20:19:16 +00:00
Fixed #14068 -- Corrected error handling in loaddata when an allow_syncdb method is defined on the router. Thanks to Xavier Ordoquy for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
e0387f7abe
commit
c2e3ba3ba0
3 changed files with 64 additions and 9 deletions
|
@ -1570,11 +1570,31 @@ class UserProfileTestCase(TestCase):
|
|||
self.assertEquals(alice.get_profile().flavor, 'chocolate')
|
||||
self.assertEquals(bob.get_profile().flavor, 'crunchy frog')
|
||||
|
||||
class AntiPetRouter(object):
|
||||
# A router that only expresses an opinion on syncdb,
|
||||
# passing pets to the 'other' database
|
||||
|
||||
def allow_syncdb(self, db, model):
|
||||
"Make sure the auth app only appears on the 'other' db"
|
||||
if db == 'other':
|
||||
return model._meta.object_name == 'Pet'
|
||||
else:
|
||||
return model._meta.object_name != 'Pet'
|
||||
return None
|
||||
|
||||
class FixtureTestCase(TestCase):
|
||||
multi_db = True
|
||||
fixtures = ['multidb-common', 'multidb']
|
||||
|
||||
def setUp(self):
|
||||
# Install the anti-pet router
|
||||
self.old_routers = router.routers
|
||||
router.routers = [AntiPetRouter()]
|
||||
|
||||
def tearDown(self):
|
||||
# Restore the 'other' database as an independent database
|
||||
router.routers = self.old_routers
|
||||
|
||||
def test_fixture_loading(self):
|
||||
"Multi-db fixtures are loaded correctly"
|
||||
# Check that "Pro Django" exists on the default database, but not on other database
|
||||
|
@ -1612,6 +1632,14 @@ class FixtureTestCase(TestCase):
|
|||
except Book.DoesNotExist:
|
||||
self.fail('"The Definitive Guide to Django" should exist on both databases')
|
||||
|
||||
def test_pseudo_empty_fixtures(self):
|
||||
"A fixture can contain entries, but lead to nothing in the database; this shouldn't raise an error (ref #14068)"
|
||||
new_io = StringIO()
|
||||
management.call_command('loaddata', 'pets', stdout=new_io, stderr=new_io)
|
||||
command_output = new_io.getvalue().strip()
|
||||
# No objects will actually be loaded
|
||||
self.assertEqual(command_output, "Installed 0 object(s) (of 2) from 1 fixture(s)")
|
||||
|
||||
class PickleQuerySetTestCase(TestCase):
|
||||
multi_db = True
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue