getting everything to pass again

diff --git a/lib/sqlalchemy/testing/plugin/noseplugin.py b/lib/sqlalchemy/testing/plugin/noseplugin.py
index 31430c8d0763831fbfca95565cd9c6e246c20deb..60190eb8b2be618d162cc6c4ee4a7119e5fd0650 100644 (file)
--- 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 cf3a12fe131c6cd71250c1a89328bde48a1dbdce..0146d1b08627836007e56fabe623ba6bcf4cd700 100644 (file)
--- 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 e15324dca6f3d97f218373a347055ab17054d889..6b2684888fc239f470399e1851ffa658660c3b1c 100644 (file)
--- 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 dc39f8e8a09e71d29fb16bc76bf099f66473b0f4..373c358fffd268bed4b72d4621ff8abdb1915bf1 100644 (file)
--- 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 53720d26bfffe9340601ebedcabcd6f427a0183f..96171f4f7ce59b7b5b672bb0a0b7dae6722c5d54 100644 (file)
--- 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 55783cd693b24e8f589cbd70ff8c10ef5470fdd1..1370c4cf8b3ff8aa1c05e6ae2014c4b7968a5532 100644 (file)
--- 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 9c0ba989eea1bdcef2547e736476861dae9d005c..e8e6ba82a9bf7ade7b3abf557d27d9fc8aa5197a 100644 (file)
--- 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 3450c133c167a4323646a187702d8dfddc017514..c6a54c0b590a336129b3e5af5389751cade4694a 100644 (file)
--- 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 5511614c806875e610a357a29dcf314ec4878bbe..a630e2f3de346200789dfe4cbf94e68d7bf25b3d 100644 (file)
--- 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 cbf2c96513985187cb38fde36085090d02442ef4..93cccee7a3df68fd70962bce4dd4a94d603c782f 100644 (file)
--- 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 ecdfef29406166f64c4ab4ba3982a90e32e7e2b0..46b1a6c3b093acb59c242738258f88b38c89e953 100644 (file)
--- 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 d5823b7a6eec84cbe11ba5d6574d7f09341e1512..fb32fb0b9b058be0aa271e6256e8617c1d59ca0a 100644 (file)
--- 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 05a017bb9bdefa200c7a208898f3e85b901297b5..25c756a587cb1e7a47f231745680a63c76979ece 100644 (file)
--- 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 01b678fac8c127815d21366fc26b65f48f9fecbe..3b548f0cd16e6cccc9cb0ccae2c3291b5df7d2ea 100644 (file)
--- 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 358c3ae8d67e4a032d1dd68266ee4aad5d547a90..5ef436b0ff56a88b9681b1e5574012fa630269f2 100644 (file)
--- 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 61fed6d18dd33228312eded98c32363599e79d88..914aefa816653f23cc76def950a9d61a9e0f91ba 100644 (file)
--- 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 8f354b083c5e876958db6f52b0aff4f95d414a95..7fc728f1dee48c9c0081defa029f8d9e581e82a0 100644 (file)
--- 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 85b880710c790500538687bc9fbfb2e869d048ce..f5593f01a72cd3614d46f3a400853c81e4c89462 100644 (file)
--- 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 aa1e9960281ae4414e90e20597c569204ed89c4d..abb08c536dc86c32095e6ea7e50dcf74022e18c4 100644 (file)
--- 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