p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #27787 -- Corrected or removed invalid call_command() options.

This commit is contained in:
Chandrakant Kumar 2017-06-16 08:47:17 -04:00 committed by Tim Graham
parent 874b1f2cac
commit f6800a081a
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
django/test/testcases.py
View File

@ -988,15 +988,11 @@ class TestCase(TransactionTestCase):
if cls.fixtures: if cls.fixtures:
for db_name in cls._databases_names(include_mirrors=False): for db_name in cls._databases_names(include_mirrors=False):
try: try:
call_command('loaddata', *cls.fixtures, **{ call_command('loaddata', *cls.fixtures, **{'verbosity': 0, 'database': db_name})
'verbosity': 0, except Exception:
'commit': False, cls._rollback_atomics(cls.cls_atomics)
'database': db_name, raise
})
except Exception:
cls._rollback_atomics(cls.cls_atomics)
raise
try: try:
cls.setUpTestData() cls.setUpTestData()
except Exception: except Exception:

10
tests/cache/tests.py vendored
View File

@ -961,7 +961,7 @@ class DBCacheTests(BaseCacheTests, TransactionTestCase):
self.drop_table() self.drop_table()
def create_table(self): def create_table(self):
management.call_command('createcachetable', verbosity=0, interactive=False) management.call_command('createcachetable', verbosity=0)
def drop_table(self): def drop_table(self):
with connection.cursor() as cursor: with connection.cursor() as cursor:
@ -1042,9 +1042,7 @@ class CreateCacheTableForDBCacheTests(TestCase):
def test_createcachetable_observes_database_router(self): def test_createcachetable_observes_database_router(self):
# cache table should not be created on 'default' # cache table should not be created on 'default'
with self.assertNumQueries(0, using='default'): with self.assertNumQueries(0, using='default'):
management.call_command('createcachetable', management.call_command('createcachetable', database='default', verbosity=0)
database='default',
verbosity=0, interactive=False)
# cache table should be created on 'other' # cache table should be created on 'other'
# Queries: # Queries:
# 1: check table doesn't already exist # 1: check table doesn't already exist
@ -1054,9 +1052,7 @@ class CreateCacheTableForDBCacheTests(TestCase):
# 5: release savepoint (if transactional DDL is supported) # 5: release savepoint (if transactional DDL is supported)
num = 5 if connections['other'].features.can_rollback_ddl else 3 num = 5 if connections['other'].features.can_rollback_ddl else 3
with self.assertNumQueries(num, using='other'): with self.assertNumQueries(num, using='other'):
management.call_command('createcachetable', management.call_command('createcachetable', database='other', verbosity=0)
database='other',
verbosity=0, interactive=False)
class PicklingSideEffect: class PicklingSideEffect:

6
tests/fixtures/tests.py vendored
View File

@ -592,8 +592,8 @@ class FixtureLoadingTests(DumpDataAssertMixin, TestCase):
def test_loading_using(self): def test_loading_using(self):
# Load db fixtures 1 and 2. These will load using the 'default' database identifier explicitly # 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_1', verbosity=0, database='default')
management.call_command('loaddata', 'db_fixture_2', verbosity=0, using='default') management.call_command('loaddata', 'db_fixture_2', verbosity=0, database='default')
self.assertQuerysetEqual(Article.objects.all(), [ self.assertQuerysetEqual(Article.objects.all(), [
'<Article: Who needs more than one database?>', '<Article: Who needs more than one database?>',
'<Article: Who needs to use compressed data?>', '<Article: Who needs to use compressed data?>',
@ -604,7 +604,7 @@ class FixtureLoadingTests(DumpDataAssertMixin, TestCase):
with self.assertRaisesMessage(CommandError, "No fixture named 'db_fixture_3' found."): with self.assertRaisesMessage(CommandError, "No fixture named 'db_fixture_3' found."):
management.call_command('loaddata', 'db_fixture_3', verbosity=0) management.call_command('loaddata', 'db_fixture_3', verbosity=0)
with self.assertRaisesMessage(CommandError, "No fixture named 'db_fixture_3' found."): with self.assertRaisesMessage(CommandError, "No fixture named 'db_fixture_3' found."):
management.call_command('loaddata', 'db_fixture_3', verbosity=0, using='default') management.call_command('loaddata', 'db_fixture_3', verbosity=0, database='default')
self.assertQuerysetEqual(Article.objects.all(), []) self.assertQuerysetEqual(Article.objects.all(), [])
def test_output_formats(self): def test_output_formats(self):