]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
- move sqlalchemy.test to test.lib
authorMike Bayer <mike_mp@zzzcomputing.com>
Tue, 16 Nov 2010 00:37:50 +0000 (19:37 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Tue, 16 Nov 2010 00:37:50 +0000 (19:37 -0500)
136 files changed:
sqla_nose.py
test/aaa_profiling/test_compiler.py
test/aaa_profiling/test_memusage.py
test/aaa_profiling/test_orm.py
test/aaa_profiling/test_pool.py
test/aaa_profiling/test_resultset.py
test/aaa_profiling/test_zoomark.py
test/aaa_profiling/test_zoomark_orm.py
test/base/test_dependency.py
test/base/test_except.py
test/base/test_utils.py
test/bootstrap/config.py
test/bootstrap/noseplugin.py
test/dialect/test_access.py
test/dialect/test_firebird.py
test/dialect/test_informix.py
test/dialect/test_maxdb.py
test/dialect/test_mssql.py
test/dialect/test_mxodbc.py
test/dialect/test_mysql.py
test/dialect/test_oracle.py
test/dialect/test_postgresql.py
test/dialect/test_sqlite.py
test/dialect/test_sybase.py
test/engine/_base.py
test/engine/test_bind.py
test/engine/test_ddlevents.py
test/engine/test_execute.py
test/engine/test_metadata.py
test/engine/test_parseconnect.py
test/engine/test_pool.py
test/engine/test_reconnect.py
test/engine/test_reflection.py
test/engine/test_transaction.py
test/ex/test_examples.py
test/ext/test_associationproxy.py
test/ext/test_compiler.py
test/ext/test_declarative.py
test/ext/test_horizontal_shard.py
test/ext/test_orderinglist.py
test/ext/test_serializer.py
test/ext/test_sqlsoup.py
test/lib/__init__.py [moved from lib/sqlalchemy/test/__init__.py with 77% similarity]
test/lib/assertsql.py [moved from lib/sqlalchemy/test/assertsql.py with 100% similarity]
test/lib/engines.py [moved from lib/sqlalchemy/test/engines.py with 99% similarity]
test/lib/entities.py [moved from lib/sqlalchemy/test/entities.py with 100% similarity]
test/lib/orm.py [moved from lib/sqlalchemy/test/orm.py with 100% similarity]
test/lib/pickleable.py [moved from lib/sqlalchemy/test/pickleable.py with 100% similarity]
test/lib/profiling.py [moved from lib/sqlalchemy/test/profiling.py with 99% similarity]
test/lib/requires.py [moved from lib/sqlalchemy/test/requires.py with 100% similarity]
test/lib/schema.py [moved from lib/sqlalchemy/test/schema.py with 98% similarity]
test/lib/testing.py [moved from lib/sqlalchemy/test/testing.py with 99% similarity]
test/lib/util.py [moved from lib/sqlalchemy/test/util.py with 100% similarity]
test/orm/_base.py
test/orm/_fixtures.py
test/orm/inheritance/test_abc_inheritance.py
test/orm/inheritance/test_abc_polymorphic.py
test/orm/inheritance/test_basic.py
test/orm/inheritance/test_concrete.py
test/orm/inheritance/test_magazine.py
test/orm/inheritance/test_manytomany.py
test/orm/inheritance/test_poly_linked_list.py
test/orm/inheritance/test_polymorph.py
test/orm/inheritance/test_polymorph2.py
test/orm/inheritance/test_productspec.py
test/orm/inheritance/test_query.py
test/orm/inheritance/test_selects.py
test/orm/inheritance/test_single.py
test/orm/test_association.py
test/orm/test_assorted_eager.py
test/orm/test_attributes.py
test/orm/test_backref_mutations.py
test/orm/test_bind.py
test/orm/test_cascade.py
test/orm/test_collection.py
test/orm/test_compile.py
test/orm/test_cycles.py
test/orm/test_defaults.py
test/orm/test_deprecations.py
test/orm/test_dynamic.py
test/orm/test_eager_relations.py
test/orm/test_evaluator.py
test/orm/test_expire.py
test/orm/test_extendedattr.py
test/orm/test_generative.py
test/orm/test_immediate_load.py
test/orm/test_instrumentation.py
test/orm/test_lazy_relations.py
test/orm/test_lazytest1.py
test/orm/test_load_on_fks.py
test/orm/test_manytomany.py
test/orm/test_mapper.py
test/orm/test_merge.py
test/orm/test_naturalpks.py
test/orm/test_onetoone.py
test/orm/test_pickled.py
test/orm/test_query.py
test/orm/test_relationships.py
test/orm/test_scoping.py
test/orm/test_selectable.py
test/orm/test_session.py
test/orm/test_subquery_relations.py
test/orm/test_transaction.py
test/orm/test_unitofwork.py
test/orm/test_unitofworkv2.py
test/orm/test_utils.py
test/orm/test_versioning.py
test/perf/insertspeed.py
test/perf/large_flush.py
test/perf/masscreate2.py
test/perf/masseagerload.py
test/perf/massload.py
test/perf/masssave.py
test/perf/objselectspeed.py
test/perf/objupdatespeed.py
test/perf/ormsession.py
test/perf/poolload.py
test/perf/sessions.py
test/perf/wsgi.py
test/sql/test_case_statement.py
test/sql/test_columns.py
test/sql/test_compiler.py
test/sql/test_constraints.py
test/sql/test_defaults.py
test/sql/test_functions.py
test/sql/test_generative.py
test/sql/test_labels.py
test/sql/test_query.py
test/sql/test_quote.py
test/sql/test_returning.py
test/sql/test_rowcount.py
test/sql/test_selectable.py
test/sql/test_types.py
test/sql/test_unicode.py
test/zblog/tables.py
test/zblog/test_zblog.py

index 6482958cba3cbcf5dfdd4862b218355f29841c17..e6f60e47671e91238d3065efff97b49be5100e58 100755 (executable)
@@ -2,8 +2,8 @@
 """
 nose runner script.
 
-This script is a front-end to "nosetests" which doesn't
-require that SQLA's testing plugin be installed via setuptools.
+This script is a front-end to "nosetests" which
+installs SQLAlchemy's testing plugin into the local environment.
 
 """
 import sys
index bc589c0b2fdb87447d0d875140c5a2ea8f58695c..a7422b49e723c11ce131c5855456571b9f7f4d48 100644 (file)
@@ -1,5 +1,5 @@
 from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
 
 
 class CompileTest(TestBase, AssertsExecutionResults):
index 5fa40a99781413d6d50c9aabb34f9f238bde206c..4b443780a74fd708f05609d0cd8c1ffda1cabaf9 100644 (file)
@@ -1,17 +1,17 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy.orm import mapper, relationship, create_session, \
     clear_mappers, sessionmaker, class_mapper
 from sqlalchemy.orm.mapper import _mapper_registry
 from sqlalchemy.orm.session import _sessions
 from sqlalchemy.util import jython
 import operator
-from sqlalchemy.test import testing, engines
+from test.lib import testing, engines
 from sqlalchemy import MetaData, Integer, String, ForeignKey, \
     PickleType, create_engine, Unicode
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 import sqlalchemy as sa
 from sqlalchemy.sql import column
-from sqlalchemy.test.util import gc_collect
+from test.lib.util import gc_collect
 import gc
 import weakref
 from test.orm import _base
index f2b876837c4967bffb833743b8e330fbd69c1419..1b39f6edb12b13d6b1bb493f6a1aa9e822c102d3 100644 (file)
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
 from sqlalchemy import exc as sa_exc, util, Integer, String, ForeignKey
 from sqlalchemy.orm import exc as orm_exc, mapper, relationship, \
     sessionmaker
-from sqlalchemy.test import testing, profiling
+from test.lib import testing, profiling
 from test.orm import _base
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 
 class MergeTest(_base.MappedTest):
index bc3c12d57f17a9d62d3dc5d131413efd8baf10dc..a63a643cee83afa3de6ddf601822c00c4bb4cc54 100644 (file)
@@ -1,5 +1,5 @@
 from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
 from sqlalchemy.pool import QueuePool
 
 
index bd9d3ae50f20b236e5f3ab84a7db348dec11faf1..9904267dc602edf238c50e6c982a25de543aadda 100644 (file)
@@ -1,5 +1,5 @@
 from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
 NUM_FIELDS = 10
 NUM_RECORDS = 1000
 
index dc990e9839795a0a05aa49a76ce3aa69ed1e676c..ec489beb15d3c8907f19b4d9020bdde89985f785 100644 (file)
@@ -7,7 +7,7 @@ import datetime
 import sys
 import time
 from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
 ITERATIONS = 1
 dbapi_session = engines.ReplayableSession()
 metadata = None
index 623ec67ba1780022ede2845a43aca9a44b0b8836..11285f9725ba6350a68fd52f95f19b3c06339245 100644 (file)
@@ -8,7 +8,7 @@ import sys
 import time
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
+from test.lib import *
 ITERATIONS = 1
 dbapi_session = engines.ReplayableSession()
 metadata = None
index 9fddfc47ffedeef31ff4b1d21d80a0a4daac7fa9..9f6344de71151bb024256f5035abbcb9b66d1be6 100644 (file)
@@ -1,6 +1,6 @@
 import sqlalchemy.topological as topological
-from sqlalchemy.test import TestBase
-from sqlalchemy.test.testing import assert_raises, eq_
+from test.lib import TestBase
+from test.lib.testing import assert_raises, eq_
 from sqlalchemy import exc, util
 
 
index 78a534e6719c2c586c0ec06b5dc05494c31e12e2..f02ca988bce14bb3047034f9042b3b2d7707be35 100644 (file)
@@ -2,7 +2,7 @@
 
 
 from sqlalchemy import exc as sa_exceptions
-from sqlalchemy.test import TestBase
+from test.lib import TestBase
 
 # Py3K 
 #StandardError = BaseException 
index d083a8458e9a78717449f8c611e54827262378b7..4f02d38110d4e44c77ac1b164d75be41414e07d6 100644 (file)
@@ -1,9 +1,9 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import copy, threading
 from sqlalchemy import util, sql, exc
-from sqlalchemy.test import TestBase
-from sqlalchemy.test.testing import eq_, is_, ne_
-from sqlalchemy.test.util import gc_collect, picklers
+from test.lib import TestBase
+from test.lib.testing import eq_, is_, ne_
+from test.lib.util import gc_collect, picklers
 from sqlalchemy.util import classproperty
 
 
index 7d528a04b048265178ce1dead9e2bed2e1f9ca3d..ef37e4f20035f95c0594648156adf6e3de9986e4 100644 (file)
@@ -123,14 +123,14 @@ def _engine_pool(options, file_config):
 post_configure['engine_pool'] = _engine_pool
 
 def _create_testing_engine(options, file_config):
-    from sqlalchemy.test import engines, testing
+    from test.lib import engines, testing
     global db
     db = engines.testing_engine(db_url, db_opts)
     testing.db = db
 post_configure['create_engine'] = _create_testing_engine
 
 def _prep_testing_database(options, file_config):
-    from sqlalchemy.test import engines
+    from test.lib import engines
     from sqlalchemy import schema
 
     # also create alt schemas etc. here?
@@ -152,7 +152,7 @@ def _prep_testing_database(options, file_config):
 post_configure['prep_db'] = _prep_testing_database
 
 def _set_table_options(options, file_config):
-    from sqlalchemy.test import schema
+    from test.lib import schema
 
     table_options = schema.table_options
     for spec in options.tableopts:
@@ -167,7 +167,7 @@ def _reverse_topological(options, file_config):
     if options.reversetop:
         from sqlalchemy.orm import unitofwork, session, mapper, dependency
         from sqlalchemy import topological
-        from sqlalchemy.test.util import RandomSet
+        from test.lib.util import RandomSet
         topological.set = unitofwork.set = session.set = mapper.set = dependency.set = RandomSet
 post_configure['topological'] = _reverse_topological
 
index f010641f68e45d2e5afc8af4b0ee796bd5c3871f..1be8be5220fc6f24d874b02132ae078adf3973c9 100644 (file)
@@ -79,7 +79,7 @@ class NoseSQLAlchemy(Plugin):
         
     def begin(self):
         global testing, requires, util
-        from sqlalchemy.test import testing, requires
+        from test.lib import testing, requires
         from sqlalchemy import util
         
         testing.db = db
index 0ea8d9a61ad41689d90797954ad7ed8613637532..bd0d7c22acb488fa6fc3d8bc850e73fe727c0f92 100644 (file)
@@ -1,7 +1,7 @@
 from sqlalchemy import *
 from sqlalchemy import sql
 from sqlalchemy.databases import access
-from sqlalchemy.test import *
+from test.lib import *
 
 
 class CompileTest(TestBase, AssertsCompiledSQL):
index 41a50e6a3baee4aad196f2a86ca77d883d2f629c..814c267b5cedd8093a85c5b7ee1a892f31d64e24 100644 (file)
@@ -1,9 +1,9 @@
-from sqlalchemy.test.testing import eq_, assert_raises
+from test.lib.testing import eq_, assert_raises
 from sqlalchemy import *
 from sqlalchemy.databases import firebird
 from sqlalchemy.exc import ProgrammingError
 from sqlalchemy.sql import table, column
-from sqlalchemy.test import *
+from test.lib import *
 
 
 class DomainReflectionTest(TestBase, AssertsExecutionResults):
index ceec587d93d218b15d6465c6679c37e213d9e337..ea74dcbe4ecbe9e60852d7576bb6497f05c6f687 100644 (file)
@@ -1,6 +1,6 @@
 from sqlalchemy import *
 from sqlalchemy.databases import informix
-from sqlalchemy.test import *
+from test.lib import *
 
 
 class CompileTest(TestBase, AssertsCompiledSQL):
index 4df0490301f02d126ca3c65d1dad725fc5f3237d..7d43d594bcf6c255c29ef3145fb70c90d2fe3660 100644 (file)
@@ -1,12 +1,12 @@
 """MaxDB-specific tests."""
 
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import StringIO, sys
 from sqlalchemy import *
 from sqlalchemy import exc, sql
 from decimal import Decimal
 from sqlalchemy.databases import maxdb
-from sqlalchemy.test import *
+from test.lib import *
 
 
 # TODO
index e766a8301ab23604aef61b744c32c9601a2908dc..26c53298c694c5f5c0f023c27d00849354d1b618 100644 (file)
@@ -1,5 +1,5 @@
 # -*- encoding: utf-8
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import datetime
 import os
 import re
@@ -11,8 +11,8 @@ from sqlalchemy.sql import table, column
 from sqlalchemy.databases import mssql
 from sqlalchemy.dialects.mssql import pyodbc, mxodbc, pymssql
 from sqlalchemy.engine import url
-from sqlalchemy.test import *
-from sqlalchemy.test.testing import eq_, emits_warning_on, \
+from test.lib import *
+from test.lib.testing import eq_, emits_warning_on, \
     assert_raises_message
 
 class CompileTest(TestBase, AssertsCompiledSQL):
index f574177dd0a8c898502257f09d227c4417fb4fcc..36cfc9b08202e15b73adbe71322a37f53f9bcd54 100644 (file)
@@ -1,6 +1,6 @@
 from sqlalchemy import *
-from sqlalchemy.test.testing import eq_, TestBase
-from sqlalchemy.test import engines
+from test.lib.testing import eq_, TestBase
+from test.lib import engines
 
 # TODO: we should probably build mock bases for
 # these to share with test_reconnect, test_parseconnect
index 78e1b9ab0c25644b249995f163d146594d02746c..02e317b024b89b1bd89212dfda0f70207649b82e 100644 (file)
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from sqlalchemy.test.testing import eq_, assert_raises
+from test.lib.testing import eq_, assert_raises
 
 # Py2K
 import sets
@@ -9,9 +9,9 @@ import sets
 from sqlalchemy import *
 from sqlalchemy import sql, exc, schema, types as sqltypes
 from sqlalchemy.dialects.mysql import base as mysql
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test import *
-from sqlalchemy.test.engines import utf8_engine
+from test.lib.testing import eq_
+from test.lib import *
+from test.lib.engines import utf8_engine
 import datetime
 
 class TypesTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL):
index 04b9d32749903a60c0459d0bdee397bc9ee5c807..e1275dbfcfb75e65b0d1a2566992eef4cb5574af 100644 (file)
@@ -1,12 +1,12 @@
 # coding: utf-8
 
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy import *
 from sqlalchemy import types as sqltypes, exc
 from sqlalchemy.sql import table, column
-from sqlalchemy.test import *
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
-from sqlalchemy.test.engines import testing_engine
+from test.lib import *
+from test.lib.testing import eq_, assert_raises, assert_raises_message
+from test.lib.engines import testing_engine
 from sqlalchemy.dialects.oracle import cx_oracle, base as oracle
 from sqlalchemy.engine import default
 from sqlalchemy.util import jython
index e20274aefa281caa6a76cf3148f03b5781c3ec5e..3bc22f2a33e6b64b1e333caf0d6ae3bfd5b24257 100644 (file)
@@ -1,6 +1,6 @@
 # coding: utf-8
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
-from sqlalchemy.test import  engines
+from test.lib.testing import eq_, assert_raises, assert_raises_message
+from test.lib import  engines
 import datetime
 import decimal
 from sqlalchemy import *
@@ -8,10 +8,10 @@ from sqlalchemy.orm import *
 from sqlalchemy import exc, schema, types
 from sqlalchemy.dialects.postgresql import base as postgresql
 from sqlalchemy.engine.strategies import MockEngineStrategy
-from sqlalchemy.test import *
-from sqlalchemy.test.util import round_decimal
+from test.lib import *
+from test.lib.util import round_decimal
 from sqlalchemy.sql import table, column
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.engine._base import TablesTest
 import logging
 
index 19ec260d3790833dd8608770390c3bbb328aa6fc..90036147b993bffe9ed60e2e3c5a0f3578294356 100644 (file)
@@ -1,13 +1,13 @@
 """SQLite-specific tests."""
 
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
 import datetime
 from sqlalchemy import *
 from sqlalchemy import exc, sql, schema
 from sqlalchemy.dialects.sqlite import base as sqlite, \
     pysqlite as pysqlite_dialect
-from sqlalchemy.test import *
+from test.lib import *
 
 
 class TestTypes(TestBase, AssertsExecutionResults):
index 37de91d1c4f64e12ee8f0fa7159ad1d941ed5ff5..54e4f32e1e3366903e7f7591c3006f43dde7d54e 100644 (file)
@@ -1,7 +1,7 @@
 from sqlalchemy import *
 from sqlalchemy import sql
 from sqlalchemy.databases import sybase
-from sqlalchemy.test import *
+from test.lib import *
 
 
 class CompileTest(TestBase, AssertsCompiledSQL):
index ec91243d24d775da407ceb0a60995b3042d1ec89..773fa2fea56662cd88ad6162b22815392c7cf379 100644 (file)
@@ -1,6 +1,6 @@
 import sqlalchemy as sa
-from sqlalchemy.test import testing
-from sqlalchemy.test.testing import adict
+from test.lib import testing
+from test.lib.testing import adict
 
 
 class TablesTest(testing.TestBase):
index dfcc5e172a061a1215fe888f0e7f7be4b78c45e1..855c3611e94b0b7c493a5ee636b310aabde80602 100644 (file)
@@ -1,14 +1,14 @@
 """tests the "bind" attribute/argument across schema and SQL,
 including the deprecated versions of these arguments"""
 
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy import engine, exc
 from sqlalchemy import MetaData, ThreadLocalMetaData
 from sqlalchemy import Integer, text
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 
 
 class BindTest(testing.TestBase):
index ccbbfd82d06d4919dd7140422728c88409e5fd78..cc4f8b0e4d4bab117c3120ffd919f75b88bd91aa 100644 (file)
@@ -1,13 +1,13 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy.schema import DDL, CheckConstraint, AddConstraint, \
     DropConstraint
 from sqlalchemy import create_engine
 from sqlalchemy import MetaData, Integer, String
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, testing, engines
-from sqlalchemy.test.testing import AssertsCompiledSQL
+from test.lib import TestBase, testing, engines
+from test.lib.testing import AssertsCompiledSQL
 from nose import SkipTest
 
 class DDLEventTest(TestBase):
index 116b8fc22365ea39b44823f3cf4d7be4f4682173..9b63945fb8b64b2d8f0e74414297cda6b6aa64be 100644 (file)
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_, assert_raises
+from test.lib.testing import eq_, assert_raises
 import re
 from sqlalchemy.interfaces import ConnectionProxy
 from sqlalchemy import MetaData, Integer, String, INT, VARCHAR, func, \
     bindparam, select
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, testing, engines
+from test.lib import TestBase, testing, engines
 import logging
 from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam
 
index b2250c808f38d5dd9c813828077d73a24ef776ba..daead42dedbd686b3bbf5149c0c1cbba02c94225 100644 (file)
@@ -1,17 +1,17 @@
-from sqlalchemy.test.testing import assert_raises
-from sqlalchemy.test.testing import assert_raises_message
-from sqlalchemy.test.testing import emits_warning
+from test.lib.testing import assert_raises
+from test.lib.testing import assert_raises_message
+from test.lib.testing import emits_warning
 
 import pickle
 from sqlalchemy import Integer, String, UniqueConstraint, \
     CheckConstraint, ForeignKey, MetaData, Sequence, \
     ForeignKeyConstraint, ColumnDefault, Index
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy import schema, exc
 import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, ComparesTables, \
+from test.lib import TestBase, ComparesTables, \
     AssertsCompiledSQL, testing, engines
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 
 class MetaDataTest(TestBase, ComparesTables):
     def test_metadata_connect(self):
index 78b75ad2f47a438bfb93af0d26cd339ecad52f70..7000549e76661925ce30ba1b1a200b300bc20fb2 100644 (file)
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message, eq_
+from test.lib.testing import assert_raises, assert_raises_message, eq_
 import ConfigParser
 import StringIO
 import sqlalchemy.engine.url as url
 from sqlalchemy import create_engine, engine_from_config
 from sqlalchemy.engine import _coerce_config
 import sqlalchemy as tsa
-from sqlalchemy.test import TestBase
+from test.lib import TestBase
 
 
 class ParseConnectTest(TestBase):
index 9db65d2ab83874d09f873ec17279a1621c529daa..a278b563a99187779e71c932b2b4ccc103446f59 100644 (file)
@@ -1,9 +1,9 @@
 import threading, time
 from sqlalchemy import pool, interfaces, create_engine, select
 import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, testing
-from sqlalchemy.test.util import gc_collect, lazy_gc
-from sqlalchemy.test.testing import eq_
+from test.lib import TestBase, testing
+from test.lib.util import gc_collect, lazy_gc
+from test.lib.testing import eq_
 
 mcid = 1
 class MockDBAPI(object):
index e26413957961b54cd6fc9a97b872c01fd822fa35..7130b6b4fb26eaa5cea71843d98ee301dd82f106 100644 (file)
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_, assert_raises
+from test.lib.testing import eq_, assert_raises
 import time
 import weakref
 from sqlalchemy import select, MetaData, Integer, String, pool
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, testing, engines
-from sqlalchemy.test.util import gc_collect
+from test.lib import TestBase, testing, engines
+from test.lib.util import gc_collect
 from sqlalchemy import exc
 
 class MockDisconnect(Exception):
index d0d6e31e13856249097a7121c4e839e8646b4a7d..cd1138985dc87b17a27d63ce757c3298269e041d 100644 (file)
@@ -1,12 +1,12 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 import StringIO, unicodedata
 from sqlalchemy import types as sql_types
 from sqlalchemy import schema
 from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy import MetaData
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 import sqlalchemy as sa
-from sqlalchemy.test import TestBase, ComparesTables, \
+from test.lib import TestBase, ComparesTables, \
                             testing, engines, AssertsCompiledSQL
 
 create_inspector = Inspector.from_engine
index f09c67164125a647b5f1987b3ca2a9599823d317..c21fc9642964526e11386d5dcf1047efe724ef82 100644 (file)
@@ -1,13 +1,13 @@
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
 import sys
 import time
 import threading
 from sqlalchemy import create_engine, MetaData, INT, VARCHAR, Sequence, \
     select, Integer, String, func, text, exc
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
-from sqlalchemy.test import TestBase, testing
+from test.lib.schema import Table
+from test.lib.schema import Column
+from test.lib import TestBase, testing
 
 
 users, metadata = None, None
index 9c68f1825962be96e2e922e7272163a2f8012ca8..311eab0413b32d63dc000d99ba7b759958114da1 100644 (file)
@@ -1,4 +1,4 @@
-from sqlalchemy.test import *
+from test.lib import *
 import os
 import re
 
index d22e4579608ab9887f913371eed37a81a4fb021c..fb2f60ff1fff0a00900a6ef1b6083f039cf202d4 100644 (file)
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import eq_, assert_raises
+from test.lib.testing import eq_, assert_raises
 import copy
 import pickle
 
@@ -7,8 +7,8 @@ from sqlalchemy.orm import *
 from sqlalchemy.orm.collections import collection
 from sqlalchemy.ext.associationproxy import *
 from sqlalchemy.ext.associationproxy import _AssociationList
-from sqlalchemy.test import *
-from sqlalchemy.test.util import gc_collect
+from test.lib import *
+from test.lib.util import gc_collect
 from sqlalchemy.sql import not_
 from test.orm import _base
 
index 3ed84fe61ccd946286414a24d398ff44c999bc5f..31b893b4834d755621a51112614027bcddfb62ae 100644 (file)
@@ -5,7 +5,7 @@ from sqlalchemy.sql.expression import ClauseElement, ColumnClause,\
 from sqlalchemy.schema import DDLElement
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.sql import table, column
-from sqlalchemy.test import *
+from test.lib import *
 
 class UserDefinedTest(TestBase, AssertsCompiledSQL):
 
index 72e2edf30e9a8a9f336ee98263185447f3feea02..89e8e910805008769fbe0c6b93d3482f660aa1af 100644 (file)
@@ -1,17 +1,17 @@
 
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
 from sqlalchemy.ext import declarative as decl
 from sqlalchemy import exc
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import MetaData, Integer, String, ForeignKey, \
     ForeignKeyConstraint, asc, Index
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import relationship, create_session, class_mapper, \
     joinedload, compile_mappers, backref, clear_mappers, \
     polymorphic_union, deferred, column_property
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy.util import classproperty
 from test.orm._base import ComparableEntity, MappedTest
 from sqlalchemy.ext.declarative import declared_attr
index 66583fb0dbdfdeff20621747573c4db16b621d36..bbd4ed2e7d204da0a944df47b185ed56c6248cbc 100644 (file)
@@ -4,8 +4,8 @@ from sqlalchemy import sql
 from sqlalchemy.orm import *
 from sqlalchemy.ext.horizontal_shard import ShardedSession
 from sqlalchemy.sql import operators
-from sqlalchemy.test import *
-from sqlalchemy.test.testing import eq_
+from test.lib import *
+from test.lib.testing import eq_
 from nose import SkipTest
 
 # TODO: ShardTest can be turned into a base for further subclasses
index 559aefd1d9e81d468e9b0a67034427e5c3a1b5d1..f7f8f7fa76a99bc3f5e1368458e0fbb6556e1579 100644 (file)
@@ -1,8 +1,8 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
 from sqlalchemy.ext.orderinglist import *
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test import *
+from test.lib.testing import eq_
+from test.lib import *
 
 
 metadata = None
index 45f55e1c9572a1438564188a5977fed9c84e4655..09a6504a3c9607c0a3c86165612ba0c38fd1f014 100644 (file)
@@ -2,14 +2,14 @@
 from sqlalchemy.ext import serializer
 from sqlalchemy import exc
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import MetaData, Integer, String, ForeignKey, select, \
     desc, func, util
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import relationship, sessionmaker, scoped_session, \
     class_mapper, mapper, joinedload, compile_mappers, aliased
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm._base import ComparableEntity, MappedTest
 
 
index 7fe8ab1782fac12031c1ea449181f7c3e183c22b..f0ac6cbed12b5396a3bb10c88051ca3b5d3d25e4 100644 (file)
@@ -1,5 +1,5 @@
 from sqlalchemy.ext import sqlsoup
-from sqlalchemy.test.testing import TestBase, eq_, assert_raises
+from test.lib.testing import TestBase, eq_, assert_raises
 from sqlalchemy import create_engine, or_, desc, select, func, exc, \
     Table, util
 from sqlalchemy.orm import scoped_session, sessionmaker
similarity index 77%
rename from lib/sqlalchemy/test/__init__.py
rename to test/lib/__init__.py
index e82b3ac9145836927e7ca7bf372d4ad4aaef3d7a..452848aff1166d629270b1ac553f028688479a9c 100644 (file)
@@ -7,9 +7,9 @@ by noseplugin.NoseSQLAlchemy.
 """
 
 from test.bootstrap import config
-from sqlalchemy.test import testing, engines, requires, profiling, pickleable
-from sqlalchemy.test.schema import Column, Table
-from sqlalchemy.test.testing import \
+from test.lib import testing, engines, requires, profiling, pickleable
+from test.lib.schema import Column, Table
+from test.lib.testing import \
      AssertsCompiledSQL, \
      AssertsExecutionResults, \
      ComparesTables, \
similarity index 99%
rename from lib/sqlalchemy/test/engines.py
rename to test/lib/engines.py
index d18b8c8cf3bf589c918528cbde8a14aaa81a04e9..61c5fb8fc536cd5ae0cd69443a1b86617600cec7 100644 (file)
@@ -128,7 +128,7 @@ def testing_engine(url=None, options=None):
     """Produce an engine configured by --options with optional overrides."""
 
     from sqlalchemy import create_engine
-    from sqlalchemy.test.assertsql import asserter
+    from test.lib.assertsql import asserter
 
     url = url or config.db_url
     options = options or config.db_opts
similarity index 100%
rename from lib/sqlalchemy/test/orm.py
rename to test/lib/orm.py
similarity index 99%
rename from lib/sqlalchemy/test/profiling.py
rename to test/lib/profiling.py
index 6f839897d95dec3a8e367cef4ae9d4bc2589f4c4..f6c21bde85cfe075195a0558088f00dd37d58465 100644 (file)
@@ -6,7 +6,7 @@ in a more fine-grained way than nose's profiling plugin.
 """
 
 import os, sys
-from sqlalchemy.test.util import function_named, gc_collect
+from test.lib.util import function_named, gc_collect
 from nose import SkipTest
 
 __all__ = 'profiled', 'function_call_count', 'conditional_call_count'
similarity index 98%
rename from lib/sqlalchemy/test/schema.py
rename to test/lib/schema.py
index d33d75e2c4d7d37742f8419a9d2184b1007ce2d9..614e5863eb66904561e265a18bdfe04c314ccc63 100644 (file)
@@ -2,7 +2,7 @@
 desired state for different backends.
 """
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import schema
 
 __all__ = 'Table', 'Column',
similarity index 99%
rename from lib/sqlalchemy/test/testing.py
rename to test/lib/testing.py
index 46723baa0471dcc2188b3398cf47a842c0b484eb..da2a3dfd30eab13ef322bdf64bc8c098d4623a80 100644 (file)
@@ -9,7 +9,7 @@ import warnings
 from cStringIO import StringIO
 
 from test.bootstrap import config
-from sqlalchemy.test import assertsql, util as testutil
+from test.lib import assertsql, util as testutil
 from sqlalchemy.util import function_named, py3k
 from engines import drop_all_tables
 
similarity index 100%
rename from lib/sqlalchemy/test/util.py
rename to test/lib/util.py
index 4d0031f5a80d97cd21c6e7d5018f13e6acd9a646..4ccc1015747878d008e665fa3f94922a3422bf51 100644 (file)
@@ -3,11 +3,11 @@ import sys
 import types
 import sqlalchemy as sa
 import sqlalchemy.exceptions as sa_exc
-from sqlalchemy.test import config, testing
-from sqlalchemy.test.testing import resolve_artifact_names, adict
-from sqlalchemy.test.engines import drop_all_tables
+from test.lib import config, testing
+from test.lib.testing import resolve_artifact_names, adict
+from test.lib.engines import drop_all_tables
 from sqlalchemy.util import function_named
-from sqlalchemy.test.entities import BasicEntity, ComparableEntity
+from test.lib.entities import BasicEntity, ComparableEntity
 
 Entity = BasicEntity
 
index a8df63b4a3f80e814d16cfb9c57c60d161e4551e..8f128c287d40212b1a811149c289e35b3dd1fae8 100644 (file)
@@ -1,8 +1,8 @@
 from sqlalchemy import MetaData, Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import attributes
-from sqlalchemy.test.testing import fixture
+from test.lib.testing import fixture
 from test.orm import _base
 
 __all__ = ()
index edbd476eca34b5baf60ba1e07733a69f6d86883b..08ab28a089a5866a0ad8f7d31425041c0c5198be 100644 (file)
@@ -2,8 +2,8 @@ from sqlalchemy import *
 from sqlalchemy.orm import *
 from sqlalchemy.orm.interfaces import ONETOMANY, MANYTOONE
 
-from sqlalchemy.test import testing
-from sqlalchemy.test.schema import Table, Column
+from test.lib import testing
+from test.lib.schema import Table, Column
 from test.orm import _base
 
 
index 2dab59bb25d24f4683c72d3b560c110ba31741ce..fb229003b7b34a7f147bb4e422e0d4917180477c 100644 (file)
@@ -4,7 +4,7 @@ from sqlalchemy.orm import *
 
 from sqlalchemy.util import function_named
 from test.orm import _base, _fixtures
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 class ABCTest(_base.MappedTest):
     @classmethod
index c6dec16b7f0e5e565ee99295ab157358b8b4b660..9d31556551e8987d29ea32b6bd257b8510eae251 100644 (file)
@@ -1,14 +1,14 @@
 import warnings
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 from sqlalchemy import *
 from sqlalchemy import exc as sa_exc, util
 from sqlalchemy.orm import *
 from sqlalchemy.orm import exc as orm_exc
 
-from sqlalchemy.test import testing, engines
+from test.lib import testing, engines
 from sqlalchemy.util import function_named
 from test.orm import _base, _fixtures
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 class O2MTest(_base.MappedTest):
     """deals with inheritance and one-to-many relationships"""
index a2d79284c05cb513bdec8b09d970e3c36f4b3b12..43ba36ace12a3b47c4aee22c66827debaf0e273b 100644 (file)
@@ -1,15 +1,15 @@
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
 from sqlalchemy import *
 from sqlalchemy.orm import *
 from sqlalchemy.orm import exc as orm_exc
-from sqlalchemy.test import *
+from test.lib import *
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from test.orm import _base
 from sqlalchemy.orm import attributes
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test.schema import Table, Column
+from test.lib.testing import eq_
+from test.lib.schema import Table, Column
 
 
 class Employee(object):
index 125a5629c6c2ffce11864126d15e3f69bd8e4a71..307c54a9cc4006dc041cead7c1a619237eab6d8c 100644 (file)
@@ -1,10 +1,10 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy.util import function_named
 from test.orm import _base
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 class BaseObject(object):
     def __init__(self, *args, **kwargs):
index 8390e2a1b754b1ec6e96bb7f8e5ef31633fbcca5..f5e3e63a172876a68b1ba7dbcc9c115a8808be61 100644 (file)
@@ -1,8 +1,8 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from test.orm import _base
 
 
index e16c95555be8039041c77681abd9330bf2d5ca0c..046cf4b345e8fd943ea75d65a82991e90744f102 100644 (file)
@@ -2,8 +2,8 @@ from sqlalchemy import *
 from sqlalchemy.orm import *
 
 from test.orm import _base
-from sqlalchemy.test import testing
-from sqlalchemy.test.schema import Table, Column
+from test.lib import testing
+from test.lib.schema import Table, Column
 
 
 class PolymorphicCircularTest(_base.MappedTest):
index eed2395d7f524c30e052d7889f5cac845b556f3e..8eeeeec50e1293c4af45fd5d9d66e94e646328da 100644 (file)
@@ -1,10 +1,10 @@
 """tests basic polymorphic mapper loading/saving, minimal relationships"""
 
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 from sqlalchemy import *
 from sqlalchemy.orm import *
 from sqlalchemy.orm import exc as orm_exc
-from sqlalchemy.test import Column, testing
+from test.lib import Column, testing
 from sqlalchemy.util import function_named
 from test.orm import _fixtures, _base
 
index 9852e8b094e35b62a56231f74bea5cc6a02b75f2..030b931a56dd5b6d24da990fa1275035cf5fc257 100644 (file)
@@ -2,16 +2,16 @@
 inheritance setups for which we maintain compatibility.
 """
 
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy import *
 from sqlalchemy import util
 from sqlalchemy.orm import *
 
-from sqlalchemy.test import TestBase, AssertsExecutionResults, testing
+from test.lib import TestBase, AssertsExecutionResults, testing
 from sqlalchemy.util import function_named
 from test.orm import _base, _fixtures
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test.schema import Table, Column
+from test.lib.testing import eq_
+from test.lib.schema import Table, Column
 
 class AttrSettable(object):
     def __init__(self, **kwargs):
index dc81d9245cfff7fb7d5b8a09c07e815e81357432..a1ecf25629ad1318f5004cba130a1e4fbc5c86d8 100644 (file)
@@ -2,9 +2,9 @@ from datetime import datetime
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from test.orm import _base
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 class InheritTest(_base.MappedTest):
     """tests some various inheritance round trips involving a particular set of polymorphic inheritance relationships"""
index 9e944ca6fd81c8ae37c6472b08782feeb955df69..e7d4d618a9ff0b70289c8c4193c547dad113ec8f 100644 (file)
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 from sqlalchemy import *
 from sqlalchemy.orm import *
 from sqlalchemy.orm import interfaces
@@ -6,10 +6,10 @@ from sqlalchemy import exc as sa_exc
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.engine import default
 
-from sqlalchemy.test import AssertsCompiledSQL, testing
+from test.lib import AssertsCompiledSQL, testing
 from test.orm import _base, _fixtures
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test.schema import Table, Column
+from test.lib.testing import eq_
+from test.lib.schema import Table, Column
 
 class Company(_fixtures.Base):
     pass
index 7c9920f6f8b00e6105a6382604b7621129fef696..5a7389386f00d09c9261fcb8c233efa1bd3b087b 100644 (file)
@@ -1,7 +1,7 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from test.orm._fixtures import Base
 from test.orm._base import MappedTest
 
index 2efde2b32ab2359bc343d23066bd71ee3862727b..a65851a5fc96f57ed9faed661b05ef10919e7781 100644 (file)
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from test.orm import _fixtures
 from test.orm._base import MappedTest, ComparableEntity
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 
 class SingleInheritanceTest(testing.AssertsCompiledSQL, MappedTest):
index c9b1584bb7fd91b0b78a3b4ea60f13b2e217ac29..e681099c55580d97ac2b75689d71622c40d5485f 100644 (file)
@@ -1,10 +1,10 @@
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session
 from test.orm import _base
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 
 
 class AssociationTest(_base.MappedTest):
index 0e389b74badbfa8ea366c2fa484948d90a250aaf..050e39d820ccd429aa16014f4b450d0f48a54bdb 100644 (file)
@@ -6,11 +6,11 @@ Derived from mailing list-reported problems and trac tickets.
 import datetime
 
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, backref, create_session
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _base
 
 
index 742e9d87475612c4a13e75cde2ea4ba86815f3bc..cedfccd5bd487083c991af02a6e503ab70d0361f 100644 (file)
@@ -3,10 +3,10 @@ import sqlalchemy.orm.attributes as attributes
 from sqlalchemy.orm.collections import collection
 from sqlalchemy.orm.interfaces import AttributeExtension
 from sqlalchemy import exc as sa_exc
-from sqlalchemy.test import *
-from sqlalchemy.test.testing import eq_, ne_, assert_raises
+from test.lib import *
+from test.lib.testing import eq_, ne_, assert_raises
 from test.orm import _base
-from sqlalchemy.test.util import gc_collect
+from test.lib.util import gc_collect
 from sqlalchemy.util import cmp, jython
 
 # global for pickling tests
index 13b44e1bb600d57806f2c548edab2dbca17d3bdb..53337c2049ff50b2d0583c948409862434a0f6f3 100644 (file)
@@ -9,14 +9,14 @@ UPDATE in the database.
 
 """
 
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy import Integer, String, ForeignKey, Sequence, exc as sa_exc
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session, class_mapper, backref, sessionmaker
 from sqlalchemy.orm import attributes, exc as orm_exc
-from sqlalchemy.test import testing
-from sqlalchemy.test.testing import eq_
+from test.lib import testing
+from test.lib.testing import eq_
 from test.orm import _base, _fixtures
 
 class O2MCollectionTest(_fixtures.FixtureTest):
index 9b1c20b6056395f07046b2fb8132dfe7ff823554..bab9be428aac9b1f73dfe21e44c115c9e559ca5d 100644 (file)
@@ -1,10 +1,10 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy import MetaData, Integer
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, create_session
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from test.orm import _base
 
 
index 75b9e22ec1c5ebeb2fadcda0144ad9c2a6224f1b..27f231b0621eadf283b20340ce5f6c8fc80b9327 100644 (file)
@@ -1,13 +1,13 @@
 
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy import Integer, String, ForeignKey, Sequence, \
     exc as sa_exc
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session, \
     sessionmaker, class_mapper, backref, Session
 from sqlalchemy.orm import attributes, exc as orm_exc
-from sqlalchemy.test import testing
-from sqlalchemy.test.testing import eq_
+from test.lib import testing
+from test.lib.testing import eq_
 from test.orm import _base, _fixtures
 
 
index 730605a7607582f0eb8480eec9481dd2a2940958..1e92d415580e9b71af3d450c0ff072c25e3490cc 100644 (file)
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import sys
 from operator import and_
 
@@ -6,13 +6,13 @@ import sqlalchemy.orm.collections as collections
 from sqlalchemy.orm.collections import collection
 
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, text
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy import util, exc as sa_exc
 from sqlalchemy.orm import create_session, mapper, relationship, attributes
 from test.orm import _base
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 
 class Canary(sa.orm.interfaces.AttributeExtension):
     def __init__(self):
index 101e4143a8b05f9a418dc6326f7f23b7bdf22181..a4fd280a2c32eb48c46fcbaec24db1b7b94f32fb 100644 (file)
@@ -1,7 +1,7 @@
 from sqlalchemy import *
 from sqlalchemy import exc as sa_exc
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
+from test.lib import *
 from test.orm import _base
 
 
index 26765244a7e0ce1975ce5a7e9c25e0cb03cc94f2..e5e6579330c818de130ecff4d51a330f9f1e4c0b 100644 (file)
@@ -5,13 +5,13 @@ T1<->T2, with o2m or m2o between them, and a third T3 with o2m/m2o to one/both
 T1/T2.
 
 """
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, backref, \
                             create_session, sessionmaker
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test.assertsql import RegexSQL, ExactSQL, CompiledSQL, AllOf
+from test.lib.testing import eq_
+from test.lib.assertsql import RegexSQL, ExactSQL, CompiledSQL, AllOf
 from test.orm import _base
 
 
index 9be8e6e5603a81822058bbad47fb96bd836126e9..8e0b689186e8a56b81b4d161575b0f74b114bca6 100644 (file)
@@ -1,11 +1,11 @@
 
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session
 from test.orm import _base
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 
 
 class TriggerDefaultsTest(_base.MappedTest):
index 76c59d029662b01aa087a88905e4db4602d389b0..2565105a64091194d9c9d5fdc9b979eeacaf034f 100644 (file)
@@ -5,10 +5,10 @@ modern (i.e. not deprecated) alternative to them.  The tests snippets here can
 be migrated directly to the wiki, docs, etc.
 
 """
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, func
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, relation, create_session, sessionmaker
 from test.orm import _base
 
index c06f6918ad9fd951242272cdf1c37e6d3dfb8e3b..c89503278df1f932d552d61179913631d89e2b32 100644 (file)
@@ -1,12 +1,12 @@
-from sqlalchemy.test.testing import eq_, ne_
+from test.lib.testing import eq_, ne_
 import operator
 from sqlalchemy.orm import dynamic_loader, backref
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, desc, select, func
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session, Query, attributes
 from sqlalchemy.orm.dynamic import AppenderMixin
-from sqlalchemy.test.testing import eq_, AssertsCompiledSQL, assert_raises_message
+from test.lib.testing import eq_, AssertsCompiledSQL, assert_raises_message
 from sqlalchemy.util import function_named
 from test.orm import _base, _fixtures
 
index b70ad0973a38cdc6966d1f14d0ed1ab5d4f1d882..aad69b14072bb955fca25ee7a03ca0f3caa4ec89 100644 (file)
@@ -1,18 +1,18 @@
 """tests of joined-eager loaded attributes"""
 
-from sqlalchemy.test.testing import eq_, is_, is_not_
+from test.lib.testing import eq_, is_, is_not_
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy.orm import joinedload, deferred, undefer, \
     joinedload_all, backref
 from sqlalchemy import Integer, String, Date, ForeignKey, and_, select, \
     func
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session, \
     lazyload, aliased
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
-from sqlalchemy.test.assertsql import CompiledSQL
+from test.lib.assertsql import CompiledSQL
 from test.orm import _base, _fixtures
 from sqlalchemy.util import OrderedDict as odict
 import datetime
index af6a3f89e3130e2d18d56131b0318274dc93fe92..26f9f49c3e3105aadda4f4a80d5d453912085d65 100644 (file)
@@ -1,11 +1,11 @@
 """Evluating SQL expressions on ORM objects"""
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import String, Integer, select
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, create_session
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _base
 
 from sqlalchemy import and_, or_, not_
index c8bdf1719e5f9d2b9b660cd1bb60228f3a391d69..93a3e198b295d1cc387b6e9a0b63fd1ed0788a59 100644 (file)
@@ -1,12 +1,12 @@
 """Attribute/instance expiration, deferral of attributes, etc."""
 
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
-from sqlalchemy.test.util import gc_collect
+from test.lib.testing import eq_, assert_raises, assert_raises_message
+from test.lib.util import gc_collect
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, exc as sa_exc
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session, \
                         attributes, deferred, exc as orm_exc, defer, undefer,\
                         strategies, state, lazyload, backref
index 4374b9ecb97eeb0733f5fd5085f56206b6d13016..83839e77b2e0a0ada2b2d237fcedc33e5c850b44 100644 (file)
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 import pickle
 from sqlalchemy import util
 import sqlalchemy.orm.attributes as attributes
@@ -6,7 +6,7 @@ from sqlalchemy.orm.collections import collection
 from sqlalchemy.orm.attributes import set_attribute, get_attribute, del_attribute, is_instrumented
 from sqlalchemy.orm import clear_mappers
 from sqlalchemy.orm import InstrumentationManager
-from sqlalchemy.test import *
+from test.lib import *
 from test.orm import _base
 
 class MyTypesManager(InstrumentationManager):
index 31b7be8cc0569c43548d2ba3a3e38f6ad7fb20a6..440dc9554245a7066069c16097e7f6d8f0b4ddb5 100644 (file)
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, MetaData, func
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _base, _fixtures
 
 
index f85208bff1da8d85c4aea009118e2d9fe76b00b7..66794ad4be9bda9d27af8c36f9ddf0e0462f442f 100644 (file)
@@ -1,8 +1,8 @@
 """basic tests of lazy loaded attributes"""
 
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy.orm import mapper, relationship, create_session, immediateload
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _fixtures
 
 
index b0c9654701a97551cb106bdfe2f24eb52f3535c0..0495ae20b1dc97da99942f1704796b3b1b1f0591 100644 (file)
@@ -1,11 +1,11 @@
 
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import sqlalchemy as sa
 from sqlalchemy import MetaData, Integer, ForeignKey, util
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session, attributes, class_mapper, clear_mappers
-from sqlalchemy.test.testing import eq_, ne_
+from test.lib.testing import eq_, ne_
 from sqlalchemy.util import function_named
 from test.orm import _base
 
index f6147a3ebf1ea1ebb1cfbbab8fc56c1ff41fe670..1bf7eecaf88f361649908846e1b65eeb7842ef19 100644 (file)
@@ -1,17 +1,17 @@
 """basic tests of lazy loaded attributes"""
 
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import datetime
 from sqlalchemy import exc as sa_exc
 from sqlalchemy.orm import attributes, exc as orm_exc
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, SmallInteger
 from sqlalchemy.types import TypeDecorator
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _base, _fixtures
 
 
index 3a96f430bb9bd01709ca4734766d0fc0e4afcf2e..15f56e618ae4b529de1c10108646457055ff6b9a 100644 (file)
@@ -1,8 +1,8 @@
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session
 from test.orm import _base
 
index 8e4f53b0d11633bc086af315d7d335154d987bb9..3e7ddb8c2a58936fc22aeeca1d8db771fd34cc42 100644 (file)
@@ -2,11 +2,11 @@ from sqlalchemy import *
 from sqlalchemy.orm import *
 
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.test.testing import TestBase, eq_, AssertsExecutionResults, assert_raises
-from sqlalchemy.test import testing
+from test.lib.testing import TestBase, eq_, AssertsExecutionResults, assert_raises
+from test.lib import testing
 from sqlalchemy.orm.attributes import instance_state
 from sqlalchemy.orm.exc import FlushError
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 engine = testing.db
 
index 1b5c5f7ac251c59fd5fa016c12de38ddadaf4849..e8660ac6a0a7a834e774391b500516ba3d256f5e 100644 (file)
@@ -1,10 +1,10 @@
-from sqlalchemy.test.testing import assert_raises, \
+from test.lib.testing import assert_raises, \
     assert_raises_message, eq_
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session, \
     exc as orm_exc, sessionmaker
 from test.orm import _base
index f041c8896bdf39719cd307b441d6dd7c8865f9cf..f60d5a871dbb86f7a88687bf37a111c854bbef29 100644 (file)
@@ -1,16 +1,16 @@
 """General mapper operations with an emphasis on selecting/loading."""
 
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import sqlalchemy as sa
-from sqlalchemy.test import testing, pickleable
+from test.lib import testing, pickleable
 from sqlalchemy import MetaData, Integer, String, ForeignKey, func, util
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.engine import default
 from sqlalchemy.orm import mapper, relationship, backref, create_session, class_mapper, compile_mappers, reconstructor, validates, aliased
 from sqlalchemy.orm import defer, deferred, synonym, attributes, column_property, composite, relationship, dynamic_loader, comparable_property,AttributeExtension
-from sqlalchemy.test.testing import eq_, AssertsCompiledSQL
+from test.lib.testing import eq_, AssertsCompiledSQL
 from test.orm import _base, _fixtures
-from sqlalchemy.test.assertsql import AllOf, CompiledSQL
+from test.lib.assertsql import AllOf, CompiledSQL
 
 
 class MapperTest(_fixtures.FixtureTest):
index d63d7e086ec0b382cf4f5189944e8d73280f45fb..47c4f0963ff59bccfef015cf79068afc70428423 100644 (file)
@@ -1,16 +1,16 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import sqlalchemy as sa
 from sqlalchemy import Integer, PickleType, String
 import operator
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy.util import OrderedSet
 from sqlalchemy.orm import mapper, relationship, create_session, PropComparator, \
                             synonym, comparable_property, sessionmaker, attributes
 from sqlalchemy.orm.collections import attribute_mapped_collection
 from sqlalchemy.orm.interfaces import MapperOption
-from sqlalchemy.test.testing import eq_, ne_
+from test.lib.testing import eq_, ne_
 from test.orm import _base, _fixtures
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 class MergeTest(_fixtures.FixtureTest):
     """Session.merge() functionality"""
index ca88251d76940cb8ddd66fba3d568f8b70243935..f9ce7b3cabecc6ee3aa7a2ed513aee5d7e0b56df 100644 (file)
@@ -2,15 +2,15 @@
 Primary key changing capabilities and passive/non-passive cascading updates.
 
 """
-from sqlalchemy.test.testing import eq_, ne_, \
+from test.lib.testing import eq_, ne_, \
                         assert_raises, assert_raises_message
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, Unicode
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session, backref, Session
 from sqlalchemy.orm.session import make_transient
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _base, _fixtures
 
 class NaturalPKTest(_base.MappedTest):
@@ -862,7 +862,7 @@ class CascadeToFKPKTest(_base.MappedTest, testing.AssertsCompiledSQL):
         sess.add(u2)
         sess.add(a2)
 
-        from sqlalchemy.test.assertsql import CompiledSQL
+        from test.lib.assertsql import CompiledSQL
         
         # test that the primary key columns of addresses are not
         # being updated as well, since this is a row switch.
index 4e3cade9bf22658f01fd3322bad396d57ade3ade..7097a266ee742b97d1ad44e3e78889b0973d0a96 100644 (file)
@@ -1,7 +1,7 @@
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session
 from test.orm import _base
 
index 5b87b2b85aaf8fd08b64a35131344805e96bb282..7119b8753889424603882ef896f996734d10ee13 100644 (file)
@@ -1,10 +1,10 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import pickle
 import sqlalchemy as sa
-from sqlalchemy.test import testing
-from sqlalchemy.test.testing import assert_raises_message
+from test.lib import testing
+from test.lib.testing import assert_raises_message
 from sqlalchemy import Integer, String, ForeignKey, exc, MetaData
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session, \
                             sessionmaker, attributes, interfaces,\
                             clear_mappers, exc as orm_exc,\
index d96fa7384615b8630e567d39aa75873065b30698..758df6ee6d5c96597db7696e3aee75ef4329e4e1 100644 (file)
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 import operator
 from sqlalchemy import *
 from sqlalchemy import exc as sa_exc, util
@@ -7,10 +7,10 @@ from sqlalchemy.engine import default
 from sqlalchemy.orm import *
 from sqlalchemy.orm import attributes
 
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 
 import sqlalchemy as sa
-from sqlalchemy.test import testing, AssertsCompiledSQL, Column, engines
+from test.lib import testing, AssertsCompiledSQL, Column, engines
 
 from test.orm import _fixtures
 from test.orm._fixtures import keywords, addresses, Base, \
index 187c9e5349535357bde3806f8b8723150d5f7c4a..eadf17b399c2d774e46c403a712bb95894a77941 100644 (file)
@@ -1,12 +1,12 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import datetime
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import Integer, String, ForeignKey, MetaData, and_
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, relation, \
                     backref, create_session, compile_mappers, clear_mappers, sessionmaker
-from sqlalchemy.test.testing import eq_, startswith_
+from test.lib.testing import eq_, startswith_
 from test.orm import _base, _fixtures
 
 
index 1682e0f7e007c82995d008dc7314d17bcb1f150b..899dac1b03cb330bc09dcd6878c8dea85ad4c2af 100644 (file)
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy.orm import scoped_session
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, query
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _base
 
 
index e46d8bbc80d2d49f01f03e2b331ce0b5c32f01e8..30278b5bccb79ca6f2a89eac4e4a8b44590f82bf 100644 (file)
@@ -1,11 +1,11 @@
 """Generic mapping to Select statements"""
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy import String, Integer, select
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, create_session
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.orm import _base
 
 
index 6ac42a6b38497e691a65ef82797e496858bfc5d0..51e59d809beaabd5e45dcaf6dedc3822bc96d14a 100644 (file)
@@ -1,18 +1,18 @@
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
-from sqlalchemy.test.util import gc_collect
+from test.lib.util import gc_collect
 import inspect
 import pickle
 from sqlalchemy.orm import create_session, sessionmaker, attributes, \
     make_transient, Session
 from sqlalchemy.orm.attributes import instance_state
 import sqlalchemy as sa
-from sqlalchemy.test import engines, testing, config
+from test.lib import engines, testing, config
 from sqlalchemy import Integer, String, Sequence
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, backref, joinedload, \
     exc as orm_exc, object_session
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from test.engine import _base as engine_base
 from test.orm import _base, _fixtures
 
index 5eba68e1396d236526e06f4ed0dc31fa12559e37..2aadf26d466fe59723eb88901cee8540b9eafec3 100644 (file)
@@ -1,13 +1,13 @@
-from sqlalchemy.test.testing import eq_, is_, is_not_
-from sqlalchemy.test import testing
-from sqlalchemy.test.schema import Table, Column
+from test.lib.testing import eq_, is_, is_not_
+from test.lib import testing
+from test.lib.schema import Table, Column
 from sqlalchemy import Integer, String, ForeignKey, bindparam
 from sqlalchemy.orm import backref, subqueryload, subqueryload_all, \
     mapper, relationship, clear_mappers, create_session, lazyload, \
     aliased, joinedload, deferred, undefer, eagerload_all
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
-from sqlalchemy.test.assertsql import CompiledSQL
+from test.lib.assertsql import CompiledSQL
 from test.orm import _base, _fixtures
 import sqlalchemy as sa
 
index 2617f12f0586285393fcfd98eea2a21c7b70d36a..7f0ada49f29e3595c526c2c909a7d4a44dfc03c7 100644 (file)
@@ -1,12 +1,12 @@
 
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 from sqlalchemy import *
 from sqlalchemy.orm import attributes
 from sqlalchemy import exc as sa_exc
 from sqlalchemy.orm import exc as orm_exc
 from sqlalchemy.orm import *
-from sqlalchemy.test.util import gc_collect
-from sqlalchemy.test import testing
+from test.lib.util import gc_collect
+from test.lib import testing
 from test.orm import _base
 from test.orm._fixtures import FixtureTest, User, Address, users, addresses
 
index 52a93a122c8349b598ace6debe1bfc114e0d6295..f228fb7d9f90c9d14c7af222f520d53658a2e585 100644 (file)
@@ -1,22 +1,22 @@
 # coding: utf-8
 """Tests unitofwork operations."""
 
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.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.test import engines, testing, pickleable
+from test.lib import engines, testing, pickleable
 from sqlalchemy import Integer, String, ForeignKey, literal_column
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
 from sqlalchemy.orm import mapper, relationship, create_session, \
     column_property, attributes, Session, reconstructor, object_session
-from sqlalchemy.test.testing import eq_, ne_
+from test.lib.testing import eq_, ne_
 from test.orm import _base, _fixtures
 from test.engine import _base as engine_base
-from sqlalchemy.test.assertsql import AllOf, CompiledSQL
+from test.lib.assertsql import AllOf, CompiledSQL
 import gc
 
 class UnitOfWorkTest(object):
index d9179930533531bbad1e06650519fc53b487d4ec..73a884e0c1db7630c00158019c259d11b6faa7b3 100644 (file)
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
-from sqlalchemy.test import testing
-from sqlalchemy.test.schema import Table, Column
+from test.lib.testing import eq_, assert_raises, assert_raises_message
+from test.lib import testing
+from test.lib.schema import Table, Column
 from sqlalchemy import Integer, String, ForeignKey, func
 from test.orm import _fixtures, _base
 from sqlalchemy.orm import mapper, relationship, backref, \
                             create_session, unitofwork, attributes
-from sqlalchemy.test.assertsql import AllOf, CompiledSQL
+from test.lib.assertsql import AllOf, CompiledSQL
 
 from test.orm._fixtures import keywords, addresses, Base, Keyword,  \
            Dingaling, item_keywords, dingalings, User, items,\
index 8635ad2125e0718358d249f933ba2ebe5d62d848..89861c78dec07425fe6e47eee44a89bbfa2d6ec1 100644 (file)
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy.orm import interfaces, util
 from sqlalchemy import Column
 from sqlalchemy import Integer
@@ -8,10 +8,10 @@ from sqlalchemy.orm import aliased
 from sqlalchemy.orm import mapper, create_session
 
 
-from sqlalchemy.test import TestBase, testing
+from test.lib import TestBase, testing
 
 from test.orm import _fixtures
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 
 
 class ExtensionCarrierTest(TestBase):
index 6cb2bb9e2c52033ec82eff33bcc258a085a9331d..75f7fbb6e85ae666eb35a234a79cec1c71a96a75 100644 (file)
@@ -1,9 +1,9 @@
 import sqlalchemy as sa
-from sqlalchemy.test import engines, testing
+from test.lib import engines, testing
 from sqlalchemy import Integer, String, ForeignKey, literal_column, orm, exc
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session, column_property, sessionmaker
-from sqlalchemy.test.testing import eq_, ne_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, ne_, assert_raises, assert_raises_message
 from test.orm import _base, _fixtures
 from test.engine import _base as engine_base
 
index 0491e9f95950ac81bfc69500c521ce11395c73d7..3ae1ccbde5fb8d891c2cd22b3ea0cb713e1a8bca 100644 (file)
@@ -2,7 +2,7 @@ import testenv; testenv.simple_setup()
 import sys, time
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import profiling
+from test.lib import profiling
 
 db = create_engine('sqlite://')
 metadata = MetaData(db)
index 431a289449456433f7b4c75264a97c3209f9aa32..b23de080ceb576b679395bfe545927c9300a7e68 100644 (file)
@@ -3,7 +3,7 @@ from sqlalchemy import create_engine, MetaData, orm
 from sqlalchemy import Column, ForeignKey
 from sqlalchemy import Integer, String
 from sqlalchemy.orm import mapper
-from sqlalchemy.test import profiling
+from test.lib import profiling
 
 class Object(object):
     pass
index e525fcf99d49750266adcfcb1fcb34ad29b9e052..6ad2194cdbd6fdb723d56a5945712f3382362355 100644 (file)
@@ -3,7 +3,7 @@ import testenv; testenv.simple_setup()
 import random, string
 
 from sqlalchemy.orm import attributes
-from sqlalchemy.test.util import gc_collect
+from test.lib.util import gc_collect
 
 # with this test, run top.  make sure the Python process doenst grow in size arbitrarily.
 
index 2ed8d2803b7c5b166d4699adf4b43c8960c5bb42..6e6d86d548d66a913a4e6e32f15d8a7d11a3a139 100644 (file)
@@ -1,6 +1,6 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import profiling
+from test.lib import profiling
 
 NUM = 500
 DIVISOR = 50
index f6cde3adfdce8a783ee16ca695db4c10a0e21eb5..06cfae786493d4e2592a18bb247fdf8b77689590 100644 (file)
@@ -2,7 +2,7 @@ import time
 #import sqlalchemy.orm.attributes as attributes
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
+from test.lib import *
 
 """
 
index 41acd12ccfb7ccef9d566759d709a30518f99e26..3c1547d3891e4ca2a32fab83ec9ebe46fc6e3174 100644 (file)
@@ -2,7 +2,7 @@ import gc
 import types
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
+from test.lib import *
 
 
 NUM = 2500
index 816643680b05189e2f48c2b59d643e9d9855ff3f..126c9c707ceff6a7df19008d667df8c07e00311a 100644 (file)
@@ -1,8 +1,8 @@
 import time, resource
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test.util import gc_collect
-from sqlalchemy.test import profiling
+from test.lib.util import gc_collect
+from test.lib import profiling
 
 db = create_engine('sqlite://')
 metadata = MetaData(db)
index fad22189abffd6b9751613d7c5884aa37cccef21..078d95fa3b3460eacc19a7f7096ad7d6ae8e9f00 100644 (file)
@@ -1,8 +1,8 @@
 import time, resource
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
-from sqlalchemy.test.util import gc_collect
+from test.lib import *
+from test.lib.util import gc_collect
 
 
 NUM = 100
index 0b01fc5a37ab1950a53b9d1b4df26c3f527d7f9d..aff265ff1907ad55745f6aab570058f4bd01ae68 100644 (file)
@@ -3,8 +3,8 @@ from datetime import datetime
 
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
-from sqlalchemy.test.profiling import profiled
+from test.lib import *
+from test.lib.profiling import profiled
 
 class Item(object):
     def __repr__(self):
index 62c66fbae67d1e4c83c75ec68161fd42d18ee97d..345720f0cb0ef9c8f17928beaffc91a6a874b6cd 100644 (file)
@@ -2,7 +2,7 @@
 import thread, time
 from sqlalchemy import *
 import sqlalchemy.pool as pool
-from sqlalchemy.test import testing
+from test.lib import testing
 
 db = create_engine(testing.db.url, pool_timeout=30, echo_pool=True)
 metadata = MetaData(db)
index 4210732d6ad49d40af89704e23a3cffa7d2dc2a4..2fe4f758fc53acdda1a6abc300e7a98caadd7d95 100644 (file)
@@ -1,8 +1,8 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-from sqlalchemy.test.compat import gc_collect
-from sqlalchemy.test import TestBase, AssertsExecutionResults, profiling, testing
+from test.lib.compat import gc_collect
+from test.lib import TestBase, AssertsExecutionResults, profiling, testing
 from test.orm import _fixtures
 
 # in this test we are specifically looking for time spent in the attributes.InstanceState.__cleanup() method.
index 549c92ade8ae0b9ed4ceb7d4df00ec111af0cad1..27aa4a8c855840a2112665cba840cc24d5d561a6 100644 (file)
@@ -4,7 +4,7 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
 import thread
-from sqlalchemy.test import *
+from test.lib import *
 
 port = 8000
 
index 1a106ee5e152cd9e06e4c2da2056da03f0b641fe..7bc3ab31f3c8d83c48de5c2ee5bbc6f5a65110cf 100644 (file)
@@ -1,7 +1,7 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message, eq_
+from test.lib.testing import assert_raises, assert_raises_message, eq_
 import sys
 from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
 from sqlalchemy import util, exc
 from sqlalchemy.sql import table, column
 
index 3cbb01943a9105360e83468177c25272358cff49..95933b41b14b1a02a1ac635699473bf3367d1dbf 100644 (file)
@@ -1,7 +1,7 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy import *
 from sqlalchemy import exc, sql
-from sqlalchemy.test import *
+from test.lib import *
 from sqlalchemy import Table, Column  # don't use testlib's wrappers
 
 
index 338a5491eed51b200bc51398fe3c9c89ab220190..788feb84df47678348fbab93758c972afd8d8de2 100644 (file)
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 import datetime, re, operator
 from sqlalchemy import *
 from sqlalchemy import exc, sql, util
@@ -6,7 +6,7 @@ from sqlalchemy.sql import table, column, label, compiler
 from sqlalchemy.sql.expression import ClauseList
 from sqlalchemy.engine import default
 from sqlalchemy.databases import *
-from sqlalchemy.test import *
+from test.lib import *
 
 table1 = table('mytable',
     column('myid', Integer),
index 69f29a9bd4b6e2c6c84bd91f9f4c85eda3ecf127..56c5c62052ec9f4a1aa5c05a2d8a02b6015a63b8 100644 (file)
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy import *
 from sqlalchemy import exc, schema
-from sqlalchemy.test import *
-from sqlalchemy.test import config, engines
+from test.lib import *
+from test.lib import config, engines
 from sqlalchemy.engine import ddl
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test.assertsql import AllOf, RegexSQL, ExactSQL, CompiledSQL
+from test.lib.testing import eq_
+from test.lib.assertsql import AllOf, RegexSQL, ExactSQL, CompiledSQL
 from sqlalchemy.dialects.postgresql import base as postgresql
 
 class ConstraintTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL):
index f49e4d0d3e4721e4770f77f51b19301a7677924b..7ec43f8d2b30fd1166ed38a64947ccd92ef0aacf 100644 (file)
@@ -1,13 +1,13 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 import datetime
 from sqlalchemy import Sequence, Column, func
 from sqlalchemy.schema import CreateSequence, DropSequence
 from sqlalchemy.sql import select, text
 import sqlalchemy as sa
-from sqlalchemy.test import testing, engines
+from test.lib import testing, engines
 from sqlalchemy import MetaData, Integer, String, ForeignKey, Boolean, exc
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.testing import eq_
+from test.lib.schema import Table
+from test.lib.testing import eq_
 from test.sql import _base
 
 
index c9bb8348c7189030fbfd463bbbee1f2c2297d737..396eaaf9ba061f4958314832628ad04f7e6ea519 100644 (file)
@@ -1,17 +1,17 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import datetime
 from sqlalchemy import *
 from sqlalchemy.sql import table, column
 from sqlalchemy import databases, sql, util
 from sqlalchemy.sql.compiler import BIND_TEMPLATES
 from sqlalchemy.engine import default
-from sqlalchemy.test.engines import all_dialects
+from test.lib.engines import all_dialects
 from sqlalchemy import types as sqltypes
-from sqlalchemy.test import *
+from test.lib import *
 from sqlalchemy.sql.functions import GenericFunction
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from decimal import Decimal as _python_Decimal
-from sqlalchemy.test import testing
+from test.lib import testing
 from sqlalchemy.databases import *
 
 
index 5457c7a7974e3029662d4e0e649d2c6ac9b2efe3..5454a0f09ecfe5a67f3464935908e2de338b8986 100644 (file)
@@ -1,11 +1,11 @@
 from sqlalchemy import *
 from sqlalchemy.sql import table, column, ClauseElement
 from sqlalchemy.sql.expression import  _clone, _from_objects
-from sqlalchemy.test import *
+from test.lib import *
 from sqlalchemy.sql.visitors import *
 from sqlalchemy import util
 from sqlalchemy.sql import util as sql_util
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 
 class TraversalTest(TestBase, AssertsExecutionResults):
     """test ClauseVisitor's traversal, particularly its ability to copy and modify
index f67ba9855fd612c344460e4e7aead2e28c0b67e5..0f84c30a0f37471dfa745adcca1e8a5ab5b89cc7 100644 (file)
@@ -1,7 +1,7 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
 from sqlalchemy import *
 from sqlalchemy import exc as exceptions
-from sqlalchemy.test import *
+from test.lib import *
 from sqlalchemy.engine import default
 
 IDENT_LENGTH = 29
index 410ff73a6549f90af17a71f1e75501cf2fe974da..f59b340766d05f8c79b0cced77d1a0178f1cd2ed 100644 (file)
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import datetime
 from sqlalchemy import *
 from sqlalchemy import exc, sql, util
 from sqlalchemy.engine import default, base
-from sqlalchemy.test import *
-from sqlalchemy.test.testing import eq_, assert_raises_message, assert_raises
-from sqlalchemy.test.schema import Table, Column
+from test.lib import *
+from test.lib.testing import eq_, assert_raises_message, assert_raises
+from test.lib.schema import Table, Column
 
 class QueryTest(TestBase):
 
index 81a68ec74d5b0c6683ff1de171cf8ab063d58bfa..8f27a7b3c15a05f16f4f11b22f748864bd84626d 100644 (file)
@@ -1,7 +1,7 @@
 from sqlalchemy import *
 from sqlalchemy import sql, schema
 from sqlalchemy.sql import compiler
-from sqlalchemy.test import *
+from test.lib import *
 
 class QuoteTest(TestBase, AssertsCompiledSQL):
     @classmethod
index 332f4eef5d6c217fb788e32da8ab000e6b4f6065..632a739f1d10f4f6f193fe0fd0f426b26ec0ff4f 100644 (file)
@@ -1,7 +1,7 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 from sqlalchemy import *
-from sqlalchemy.test import *
-from sqlalchemy.test.schema import Table, Column
+from test.lib import *
+from test.lib.schema import Table, Column
 from sqlalchemy.types import TypeDecorator
 
 class ReturningTest(TestBase, AssertsExecutionResults):
index ccd0d8f5eab46f424ba820cebf7b9e734a3b4af4..ed40f28018877a3e6786399b3376733d401691c8 100644 (file)
@@ -1,5 +1,5 @@
 from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
 
 
 class FoundRowsTest(TestBase, AssertsExecutionResults):
index 5bebbe05f4975276c755bd9255a56c3ce2a93d95..77acf896b6d8da2ebeea3688ebd66758835f30ca 100644 (file)
@@ -1,9 +1,9 @@
 """Test various algorithmic properties of selectables."""
 
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
     assert_raises_message
 from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
 from sqlalchemy.sql import util as sql_util, visitors
 from sqlalchemy import exc
 from sqlalchemy.sql import table, column, null
index 99384389136eb1684afda52fb26372fe2ab358cc..bfadca7c914e7bbadec842f0456133f50f8c684d 100644 (file)
@@ -1,18 +1,18 @@
 # coding: utf-8
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
 import decimal
 import datetime, os, re
 from sqlalchemy import *
 from sqlalchemy import exc, types, util, schema
 from sqlalchemy.sql import operators, column, table
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
 import sqlalchemy.engine.url as url
 from sqlalchemy.databases import *
-from sqlalchemy.test.schema import Table, Column
-from sqlalchemy.test import *
-from sqlalchemy.test.util import picklers
+from test.lib.schema import Table, Column
+from test.lib import *
+from test.lib.util import picklers
 from decimal import Decimal
-from sqlalchemy.test.util import round_decimal
+from test.lib.util import round_decimal
 
 
 class AdaptTest(TestBase):
index a116d34cbd2bebe484060f5fee8fc1f830ba5206..2eda4ffa840dce8542cec0a32640ea13fff40603 100644 (file)
@@ -2,8 +2,8 @@
 """verrrrry basic unicode column name testing"""
 
 from sqlalchemy import *
-from sqlalchemy.test import *
-from sqlalchemy.test.engines import utf8_engine
+from test.lib import *
+from test.lib.engines import utf8_engine
 from sqlalchemy.sql import column
 
 class UnicodeSchemaTest(TestBase):
index 4907259e18df0e987f44e91e53ec95925a8bc1a9..3326c28fbe398dde76653a9dc5fe7acc10c582ed 100644 (file)
@@ -1,7 +1,7 @@
 """application table metadata objects are described here."""
 
 from sqlalchemy import *
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
 
 metadata = MetaData()
 
index 8103cde8b0d988e7f3b0540a0d139ceab7860afe..ec6402a6efc12056f566e0439f8f9362d3e9741a 100644 (file)
@@ -1,6 +1,6 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
+from test.lib import *
 from test.zblog import mappers, tables
 from test.zblog.user import *
 from test.zblog.blog import *