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-27 13:34:33 -0500
commitd8d03011b8dafe48b71e9eb3bc756d05da54a7bf (patch)
treedde1fae4d98e80d2080b191704dbef529a8f157c
parentd20d7549fd32d867739169ac2556f3fa0157b4b1 (diff)
downloadsqlalchemy-d8d03011b8dafe48b71e9eb3bc756d05da54a7bf.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 464a723d2..28541b14b 100644
--- a/lib/sqlalchemy/testing/fixtures.py
+++ b/lib/sqlalchemy/testing/fixtures.py
@@ -348,5 +348,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 c3ed73c9c..cbfbf5ba7 100644
--- a/test/orm/inheritance/test_assorted_poly.py
+++ b/test/orm/inheritance/test_assorted_poly.py
@@ -1525,7 +1525,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