getting everything to pass again

19 files changed, 38 insertions, 28 deletions

diff --git a/lib/sqlalchemy/testing/plugin/noseplugin.py b/lib/sqlalchemy/testing/plugin/noseplugin.py
index 31430c8d0..60190eb8b 100644
--- a/lib/sqlalchemy/testing/plugin/noseplugin.py
+++ b/lib/sqlalchemy/testing/plugin/noseplugin.py
@@ -115,8 +115,7 @@ class NoseSQLAlchemy(Plugin):
         return ""
 
     def wantFunction(self, fn):
-        if fn.__module__.startswith('test.lib') or \
-            fn.__module__.startswith('test.bootstrap'):
+        if fn.__module__.startswith('sqlalchemy.testing'):
             return False
 
     def wantClass(self, cls):
diff --git a/test/aaa_profiling/test_resultset.py b/test/aaa_profiling/test_resultset.py
index cf3a12fe1..0146d1b08 100644
--- a/test/aaa_profiling/test_resultset.py
+++ b/test/aaa_profiling/test_resultset.py
@@ -1,5 +1,6 @@
 from sqlalchemy import *
-from sqlalchemy.testing import *
+from sqlalchemy.testing import fixtures, AssertsExecutionResults, profiling
+from sqlalchemy import testing
 from sqlalchemy.testing import eq_
 NUM_FIELDS = 10
 NUM_RECORDS = 1000
diff --git a/test/dialect/test_mssql.py b/test/dialect/test_mssql.py
index e15324dca..6b2684888 100644
--- a/test/dialect/test_mssql.py
+++ b/test/dialect/test_mssql.py
@@ -12,7 +12,9 @@ from sqlalchemy.databases import mssql
 from sqlalchemy.dialects.mssql import pyodbc, mxodbc, pymssql
 from sqlalchemy.dialects.mssql.base import TIME
 from sqlalchemy.engine import url
-from sqlalchemy.testing import *
+from sqlalchemy.testing import fixtures, AssertsCompiledSQL, \
+        AssertsExecutionResults, ComparesTables
+from sqlalchemy import testing
 from sqlalchemy.testing import eq_, emits_warning_on, \
     assert_raises_message
 from sqlalchemy.util.compat import decimal
diff --git a/test/dialect/test_oracle.py b/test/dialect/test_oracle.py
index dc39f8e8a..373c358ff 100644
--- a/test/dialect/test_oracle.py
+++ b/test/dialect/test_oracle.py
@@ -4,7 +4,8 @@ from sqlalchemy.testing import eq_
 from sqlalchemy import *
 from sqlalchemy import types as sqltypes, exc
 from sqlalchemy.sql import table, column
-from sqlalchemy.testing import *
+from sqlalchemy.testing import fixtures, AssertsExecutionResults, AssertsCompiledSQL
+from sqlalchemy import testing
 from sqlalchemy.testing import eq_, assert_raises, assert_raises_message
 from sqlalchemy.testing.engines import testing_engine
 from sqlalchemy.dialects.oracle import cx_oracle, base as oracle
diff --git a/test/dialect/test_sqlite.py b/test/dialect/test_sqlite.py
index 53720d26b..96171f4f7 100644
--- a/test/dialect/test_sqlite.py
+++ b/test/dialect/test_sqlite.py
@@ -8,7 +8,9 @@ from sqlalchemy import exc, sql, schema, pool, types as sqltypes
 from sqlalchemy.dialects.sqlite import base as sqlite, \
     pysqlite as pysqlite_dialect
 from sqlalchemy.engine.url import make_url
-from sqlalchemy.testing import *
+from sqlalchemy.testing import fixtures, AssertsCompiledSQL, \
+    AssertsExecutionResults, engines
+from sqlalchemy import testing
 import os
 from sqlalchemy.schema import CreateTable
 
diff --git a/test/orm/inheritance/_poly_fixtures.py b/test/orm/inheritance/_poly_fixtures.py
index 55783cd69..1370c4cf8 100644
--- a/test/orm/inheritance/_poly_fixtures.py
+++ b/test/orm/inheritance/_poly_fixtures.py
@@ -6,7 +6,8 @@ from sqlalchemy.orm import interfaces, relationship, mapper, \
 from sqlalchemy import exc as sa_exc
 from sqlalchemy.engine import default
 
-from sqlalchemy.testing import AssertsCompiledSQL, fixtures, testing
+from sqlalchemy.testing import AssertsCompiledSQL, fixtures
+from sqlalchemy import testing
 from sqlalchemy.testing.schema import Table, Column
 from sqlalchemy.testing import assert_raises, eq_
 
diff --git a/test/orm/inheritance/test_assorted_poly.py b/test/orm/inheritance/test_assorted_poly.py
index 9c0ba989e..e8e6ba82a 100644
--- a/test/orm/inheritance/test_assorted_poly.py
+++ b/test/orm/inheritance/test_assorted_poly.py
@@ -8,7 +8,8 @@ from sqlalchemy import *
 from sqlalchemy import util
 from sqlalchemy.orm import *
 from sqlalchemy.orm.interfaces import MANYTOONE
-from sqlalchemy.testing import AssertsExecutionResults, testing
+from sqlalchemy.testing import AssertsExecutionResults
+from sqlalchemy import testing
 from sqlalchemy.testing.util import function_named
 from sqlalchemy.testing import fixtures
 from test.orm import _fixtures
diff --git a/test/orm/inheritance/test_poly_persistence.py b/test/orm/inheritance/test_poly_persistence.py
index 3450c133c..c6a54c0b5 100644
--- a/test/orm/inheritance/test_poly_persistence.py
+++ b/test/orm/inheritance/test_poly_persistence.py
@@ -5,7 +5,8 @@ from sqlalchemy import *
 from sqlalchemy.orm import *
 from sqlalchemy.orm import exc as orm_exc
 from sqlalchemy import exc as sa_exc
-from sqlalchemy.testing import Column, testing
+from sqlalchemy.testing.schema import Column
+from sqlalchemy import testing
 from sqlalchemy.testing.util import function_named
 from test.orm import _fixtures
 from sqlalchemy.testing import fixtures
diff --git a/test/orm/inheritance/test_relationship.py b/test/orm/inheritance/test_relationship.py
index 5511614c8..a630e2f3d 100644
--- a/test/orm/inheritance/test_relationship.py
+++ b/test/orm/inheritance/test_relationship.py
@@ -5,7 +5,8 @@ from sqlalchemy.orm import create_session, relationship, mapper, \
 from sqlalchemy import Integer, String, ForeignKey
 from sqlalchemy.engine import default
 
-from sqlalchemy.testing import AssertsCompiledSQL, fixtures, testing
+from sqlalchemy.testing import AssertsCompiledSQL, fixtures
+from sqlalchemy import testing
 from sqlalchemy.testing.schema import Table, Column
 from sqlalchemy.testing import assert_raises, eq_
 
diff --git a/test/orm/inheritance/test_with_poly.py b/test/orm/inheritance/test_with_poly.py
index cbf2c9651..93cccee7a 100644
--- a/test/orm/inheritance/test_with_poly.py
+++ b/test/orm/inheritance/test_with_poly.py
@@ -6,7 +6,8 @@ from sqlalchemy.orm import interfaces, relationship, mapper, \
 from sqlalchemy import exc as sa_exc
 from sqlalchemy.engine import default
 
-from sqlalchemy.testing import AssertsCompiledSQL, fixtures, testing
+from sqlalchemy.testing import AssertsCompiledSQL, fixtures
+from sqlalchemy import testing
 from sqlalchemy.testing.schema import Table, Column
 from sqlalchemy.testing import assert_raises, eq_
 
diff --git a/test/orm/test_attributes.py b/test/orm/test_attributes.py
index ecdfef294..46b1a6c3b 100644
--- a/test/orm/test_attributes.py
+++ b/test/orm/test_attributes.py
@@ -3,13 +3,13 @@ from sqlalchemy.orm import attributes, instrumentation, exc as orm_exc
 from sqlalchemy.orm.collections import collection
 from sqlalchemy.orm.interfaces import AttributeExtension
 from sqlalchemy import exc as sa_exc
-from sqlalchemy.testing import *
 from sqlalchemy.testing import eq_, ne_, assert_raises, \
     assert_raises_message
 from sqlalchemy.testing import fixtures
 from sqlalchemy.testing.util import gc_collect, all_partial_orderings
 from sqlalchemy.util import jython
 from sqlalchemy import event
+from sqlalchemy import testing
 
 # global for pickling tests
 MyTest = None
diff --git a/test/orm/test_compile.py b/test/orm/test_compile.py
index d5823b7a6..fb32fb0b9 100644
--- a/test/orm/test_compile.py
+++ b/test/orm/test_compile.py
@@ -1,9 +1,9 @@
 from sqlalchemy import *
 from sqlalchemy import exc as sa_exc
 from sqlalchemy.orm import *
-from sqlalchemy.testing import *
 from sqlalchemy.testing import assert_raises_message
 from sqlalchemy.testing import fixtures
+from sqlalchemy import testing
 
 
 class CompileTest(fixtures.ORMTest):
diff --git a/test/orm/test_froms.py b/test/orm/test_froms.py
index 05a017bb9..25c756a58 100644
--- a/test/orm/test_froms.py
+++ b/test/orm/test_froms.py
@@ -11,7 +11,8 @@ from sqlalchemy.testing import eq_
 
 import sqlalchemy as sa
 from sqlalchemy import testing
-from sqlalchemy.testing import AssertsCompiledSQL, Column, engines
+from sqlalchemy.testing import AssertsCompiledSQL, engines
+from sqlalchemy.testing.schema import Column
 
 from test.orm import _fixtures
 
diff --git a/test/orm/test_instrumentation.py b/test/orm/test_instrumentation.py
index 01b678fac..3b548f0cd 100644
--- a/test/orm/test_instrumentation.py
+++ b/test/orm/test_instrumentation.py
@@ -7,7 +7,8 @@ from sqlalchemy.orm import mapper, relationship, create_session, \
 from sqlalchemy.testing.schema import Table
 from sqlalchemy.testing.schema import Column
 from sqlalchemy.testing import eq_, ne_
-from sqlalchemy.testing import fixtures, testing
+from sqlalchemy.testing import fixtures
+from sqlalchemy import testing
 
 
 class InitTest(fixtures.ORMTest):
diff --git a/test/orm/test_joins.py b/test/orm/test_joins.py
index 358c3ae8d..5ef436b0f 100644
--- a/test/orm/test_joins.py
+++ b/test/orm/test_joins.py
@@ -11,7 +11,8 @@ from sqlalchemy.testing import eq_
 
 import sqlalchemy as sa
 from sqlalchemy import testing
-from sqlalchemy.testing import AssertsCompiledSQL, Column, engines
+from sqlalchemy.testing import AssertsCompiledSQL, engines
+from sqlalchemy.testing.schema import Column
 from test.orm import _fixtures
 
 from sqlalchemy.testing import fixtures
diff --git a/test/orm/test_session.py b/test/orm/test_session.py
index 61fed6d18..914aefa81 100644
--- a/test/orm/test_session.py
+++ b/test/orm/test_session.py
@@ -7,14 +7,14 @@ import inspect
 from sqlalchemy.orm import create_session, sessionmaker, attributes, \
     make_transient, Session
 import sqlalchemy as sa
-from sqlalchemy.testing import engines, testing, config
+from sqlalchemy.testing import engines, config
+from sqlalchemy import testing
 from sqlalchemy import Integer, String, Sequence
 from sqlalchemy.testing.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, backref, joinedload, \
     exc as orm_exc, object_session
 from sqlalchemy.util import pypy
 from sqlalchemy.testing import fixtures
-from sqlalchemy.testing import fixtures
 from test.orm import _fixtures
 
 class SessionTest(_fixtures.FixtureTest):
diff --git a/test/orm/test_unitofwork.py b/test/orm/test_unitofwork.py
index 8f354b083..7fc728f1d 100644
--- a/test/orm/test_unitofwork.py
+++ b/test/orm/test_unitofwork.py
@@ -3,24 +3,19 @@
 
 from sqlalchemy.testing import eq_, assert_raises, assert_raises_message
 import datetime
-import operator
 from sqlalchemy.orm import mapper as orm_mapper
 
 import sqlalchemy as sa
 from sqlalchemy import Integer, String, ForeignKey, literal_column, event
-from sqlalchemy.testing import engines, testing, pickleable
+from sqlalchemy.testing import engines
+from sqlalchemy import testing
 from sqlalchemy.testing.schema import Table
 from sqlalchemy.testing.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session, \
-    column_property, attributes, Session, reconstructor, object_session,\
-    exc as orm_exc
-from sqlalchemy.testing import eq_, ne_
-from sqlalchemy.testing.util import gc_collect
+    column_property, Session, exc as orm_exc
 from sqlalchemy.testing import fixtures
 from test.orm import _fixtures
-from sqlalchemy.testing import fixtures
 from sqlalchemy.testing.assertsql import AllOf, CompiledSQL
-import gc
 
 class UnitOfWorkTest(object):
     pass
diff --git a/test/orm/test_update_delete.py b/test/orm/test_update_delete.py
index 85b880710..f5593f01a 100644
--- a/test/orm/test_update_delete.py
+++ b/test/orm/test_update_delete.py
@@ -1,7 +1,8 @@
 from sqlalchemy.testing import eq_, assert_raises, assert_raises_message
-from sqlalchemy.testing import fixtures, testing
+from sqlalchemy.testing import fixtures
 from sqlalchemy import Integer, String, ForeignKey, or_, and_, exc, select, func
 from sqlalchemy.orm import mapper, relationship, backref, Session, joinedload
+from sqlalchemy import testing
 
 from sqlalchemy.testing.schema import Table, Column
 
diff --git a/test/orm/test_versioning.py b/test/orm/test_versioning.py
index aa1e99602..abb08c536 100644
--- a/test/orm/test_versioning.py
+++ b/test/orm/test_versioning.py
@@ -1,6 +1,7 @@
 import datetime
 import sqlalchemy as sa
-from sqlalchemy.testing import engines, testing
+from sqlalchemy.testing import engines
+from sqlalchemy import testing
 from sqlalchemy import Integer, String, Date, ForeignKey, literal_column, \
     orm, exc, select, TypeDecorator
 from sqlalchemy.testing.schema import Table, Column