mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 03:25:58 +00:00
Code Issues 30 Releases Wiki Activity

Only swallow table-does-not-exist errors in tests

Browse Source
This commit is contained in:
Andrew Godwin 2012-09-24 13:30:17 +01:00
parent 0bcfc068b0
commit 15c1920964
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/modeltests/schema/tests.py
View File

@ -20,6 +20,7 @@ class SchemaTests(TestCase):
""" """
models = [Author, AuthorWithM2M, Book, BookWithSlug, BookWithM2M, Tag, TagUniqueRename, UniqueTest] models = [Author, AuthorWithM2M, Book, BookWithSlug, BookWithM2M, Tag, TagUniqueRename, UniqueTest]
no_table_strings = ["no such table", "unknown table", "does not exist"]
# Utility functions # Utility functions
@ -57,8 +58,11 @@ class SchemaTests(TestCase):
cursor.execute(connection.schema_editor().sql_delete_table % { cursor.execute(connection.schema_editor().sql_delete_table % {
"table": connection.ops.quote_name(field.rel.through._meta.db_table), "table": connection.ops.quote_name(field.rel.through._meta.db_table),
}) })
except DatabaseError: except DatabaseError as e:
connection.rollback() if any([s in str(e).lower() for s in self.no_table_strings]):
connection.rollback()
else:
raise
else: else:
connection.commit() connection.commit()
# Then remove the main tables # Then remove the main tables
@ -66,8 +70,11 @@ class SchemaTests(TestCase):
cursor.execute(connection.schema_editor().sql_delete_table % { cursor.execute(connection.schema_editor().sql_delete_table % {
"table": connection.ops.quote_name(model._meta.db_table), "table": connection.ops.quote_name(model._meta.db_table),
}) })
except DatabaseError: except DatabaseError as e:
connection.rollback() if any([s in str(e).lower() for s in self.no_table_strings]):
connection.rollback()
else:
raise
else: else:
connection.commit() connection.commit()
connection.enable_constraint_checking() connection.enable_constraint_checking()