From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 27 Jan 2014 18:34:33 +0000 (-0500)
Subject: - repair the fixture/test here to make sure state isn't left over causing other tests... 
X-Git-Tag: rel_0_9_2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8d03011b8dafe48b71e9eb3bc756d05da54a7bf;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- repair the fixture/test here to make sure state isn't left over causing other tests to fail
---

diff --git a/lib/sqlalchemy/testing/fixtures.py b/lib/sqlalchemy/testing/fixtures.py
index 464a723d29..28541b14b5 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 c3ed73c9ca..cbfbf5ba77 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