From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 2 Jan 2015 20:23:24 +0000 (-0500)
Subject: - test failures:
X-Git-Tag: rel_1_0_0b1~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ab50ec0118df01d1f062458d8662bbc2200faad;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- test failures:
- test_schema_2 is only on PG and doesn't need a drop all, omit this for now
- py3k has exception.args[0], not message
---

diff --git a/lib/sqlalchemy/sql/ddl.py b/lib/sqlalchemy/sql/ddl.py
index 331a283f01..7a1c7fef6a 100644
--- a/lib/sqlalchemy/sql/ddl.py
+++ b/lib/sqlalchemy/sql/ddl.py
@@ -809,7 +809,7 @@ class SchemaDropper(DDLBase):
         except exc.CircularDependencyError as err2:
             util.raise_from_cause(
                 exc.CircularDependencyError(
-                    err2.message,
+                    err2.args[0],
                     err2.cycles, err2.edges,
                     msg="Can't sort tables for DROP; an "
                     "unresolvable foreign key "
diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py
index 3563b88dbf..b0188aa5a0 100644
--- a/lib/sqlalchemy/testing/plugin/plugin_base.py
+++ b/lib/sqlalchemy/testing/plugin/plugin_base.py
@@ -329,7 +329,6 @@ def _prep_testing_database(options, file_config):
 
             if config.requirements.schemas.enabled_for_config(cfg):
                 util.drop_all_tables(e, inspector, schema=cfg.test_schema)
-                util.drop_all_tables(e, inspector, schema=cfg.test_schema_2)
 
             if against(cfg, "postgresql"):
                 from sqlalchemy.dialects import postgresql