summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-01-27 13:34:33 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-01-28 19:49:15 -0500
commitb05adc9507cbf924aba5629e72ad609515050ac4 (patch)
tree1a6db4ea5c02a8324d760cd14d0f893508b33454
parentda4256d3dc2f7b6c5005010aa8fe860e994e8300 (diff)
downloadsqlalchemy-b05adc9507cbf924aba5629e72ad609515050ac4.tar.gz
- repair the fixture/test here to make sure state isn't left over causing other tests to fail
-rw-r--r--lib/sqlalchemy/testing/fixtures.py2
-rw-r--r--test/orm/inheritance/test_assorted_poly.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/testing/fixtures.py b/lib/sqlalchemy/testing/fixtures.py
index 5c587cb2f..28dcd7928 100644
--- a/lib/sqlalchemy/testing/fixtures.py
+++ b/lib/sqlalchemy/testing/fixtures.py
@@ -340,5 +340,5 @@ class DeclarativeMappedTest(MappedTest):
cls.DeclarativeBasic = _DeclBase
fn()
- if cls.metadata.tables:
+ if cls.metadata.tables and cls.run_create_tables:
cls.metadata.create_all(config.db)
diff --git a/test/orm/inheritance/test_assorted_poly.py b/test/orm/inheritance/test_assorted_poly.py
index eb8abdba7..58544ee90 100644
--- a/test/orm/inheritance/test_assorted_poly.py
+++ b/test/orm/inheritance/test_assorted_poly.py
@@ -1524,7 +1524,7 @@ class Ticket2419Test(fixtures.DeclarativeMappedTest):
class ColSubclassTest(fixtures.DeclarativeMappedTest, testing.AssertsCompiledSQL):
"""Test [ticket:2918]'s test case."""
- run_create_tables = None
+ run_create_tables = run_deletes = None
__dialect__ = 'default'
@classmethod