diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-11-15 19:37:50 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-11-15 19:37:50 -0500 |
| commit | e1402efb198f96090833a9b561cdba8dee937f70 (patch) | |
| tree | c20dc33466476bbf394e8e19da7a045c8a008d08 /test/aaa_profiling | |
| parent | 756aa2724e495b8a969bca73d133b27615a343e7 (diff) | |
| download | sqlalchemy-e1402efb198f96090833a9b561cdba8dee937f70.tar.gz | |
- move sqlalchemy.test to test.lib
Diffstat (limited to 'test/aaa_profiling')
| -rw-r--r-- | test/aaa_profiling/test_compiler.py | 2 | ||||
| -rw-r--r-- | test/aaa_profiling/test_memusage.py | 8 | ||||
| -rw-r--r-- | test/aaa_profiling/test_orm.py | 6 | ||||
| -rw-r--r-- | test/aaa_profiling/test_pool.py | 2 | ||||
| -rw-r--r-- | test/aaa_profiling/test_resultset.py | 2 | ||||
| -rw-r--r-- | test/aaa_profiling/test_zoomark.py | 2 | ||||
| -rw-r--r-- | test/aaa_profiling/test_zoomark_orm.py | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/test/aaa_profiling/test_compiler.py b/test/aaa_profiling/test_compiler.py index bc589c0b2..a7422b49e 100644 --- a/test/aaa_profiling/test_compiler.py +++ b/test/aaa_profiling/test_compiler.py @@ -1,5 +1,5 @@ from sqlalchemy import * -from sqlalchemy.test import * +from test.lib import * class CompileTest(TestBase, AssertsExecutionResults): diff --git a/test/aaa_profiling/test_memusage.py b/test/aaa_profiling/test_memusage.py index 5fa40a997..4b443780a 100644 --- a/test/aaa_profiling/test_memusage.py +++ b/test/aaa_profiling/test_memusage.py @@ -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 diff --git a/test/aaa_profiling/test_orm.py b/test/aaa_profiling/test_orm.py index f2b876837..1b39f6edb 100644 --- a/test/aaa_profiling/test_orm.py +++ b/test/aaa_profiling/test_orm.py @@ -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): diff --git a/test/aaa_profiling/test_pool.py b/test/aaa_profiling/test_pool.py index bc3c12d57..a63a643ce 100644 --- a/test/aaa_profiling/test_pool.py +++ b/test/aaa_profiling/test_pool.py @@ -1,5 +1,5 @@ from sqlalchemy import * -from sqlalchemy.test import * +from test.lib import * from sqlalchemy.pool import QueuePool diff --git a/test/aaa_profiling/test_resultset.py b/test/aaa_profiling/test_resultset.py index bd9d3ae50..9904267dc 100644 --- a/test/aaa_profiling/test_resultset.py +++ b/test/aaa_profiling/test_resultset.py @@ -1,5 +1,5 @@ from sqlalchemy import * -from sqlalchemy.test import * +from test.lib import * NUM_FIELDS = 10 NUM_RECORDS = 1000 diff --git a/test/aaa_profiling/test_zoomark.py b/test/aaa_profiling/test_zoomark.py index dc990e983..ec489beb1 100644 --- a/test/aaa_profiling/test_zoomark.py +++ b/test/aaa_profiling/test_zoomark.py @@ -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 diff --git a/test/aaa_profiling/test_zoomark_orm.py b/test/aaa_profiling/test_zoomark_orm.py index 623ec67ba..11285f972 100644 --- a/test/aaa_profiling/test_zoomark_orm.py +++ b/test/aaa_profiling/test_zoomark_orm.py @@ -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 |
