Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 15c1920964d2ff9a820986232cac11ae2dea048d 1 parent 0bcfc06
@andrewgodwin andrewgodwin authored
Showing with 11 additions and 4 deletions.
  1. +11 −4 tests/modeltests/schema/tests.py
View
15 tests/modeltests/schema/tests.py
@@ -20,6 +20,7 @@ class SchemaTests(TestCase):
"""
models = [Author, AuthorWithM2M, Book, BookWithSlug, BookWithM2M, Tag, TagUniqueRename, UniqueTest]
+ no_table_strings = ["no such table", "unknown table", "does not exist"]
# Utility functions
@@ -57,8 +58,11 @@ def delete_tables(self):
cursor.execute(connection.schema_editor().sql_delete_table % {
"table": connection.ops.quote_name(field.rel.through._meta.db_table),
})
- except DatabaseError:
- connection.rollback()
+ except DatabaseError as e:
+ if any([s in str(e).lower() for s in self.no_table_strings]):
+ connection.rollback()
+ else:
+ raise
else:
connection.commit()
# Then remove the main tables
@@ -66,8 +70,11 @@ def delete_tables(self):
cursor.execute(connection.schema_editor().sql_delete_table % {
"table": connection.ops.quote_name(model._meta.db_table),
})
- except DatabaseError:
- connection.rollback()
+ except DatabaseError as e:
+ if any([s in str(e).lower() for s in self.no_table_strings]):
+ connection.rollback()
+ else:
+ raise
else:
connection.commit()
connection.enable_constraint_checking()
Please sign in to comment.
Something went wrong with that request. Please try again.