- move sqlalchemy.test to test.lib

12 files changed, 16 insertions, 16 deletions

diff --git a/test/perf/insertspeed.py b/test/perf/insertspeed.py
index 0491e9f95..3ae1ccbde 100644
--- a/test/perf/insertspeed.py
+++ b/test/perf/insertspeed.py
@@ -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)
diff --git a/test/perf/large_flush.py b/test/perf/large_flush.py
index 431a28944..b23de080c 100644
--- a/test/perf/large_flush.py
+++ b/test/perf/large_flush.py
@@ -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
diff --git a/test/perf/masscreate2.py b/test/perf/masscreate2.py
index e525fcf99..6ad2194cd 100644
--- a/test/perf/masscreate2.py
+++ b/test/perf/masscreate2.py
@@ -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.
 
diff --git a/test/perf/masseagerload.py b/test/perf/masseagerload.py
index 2ed8d2803..6e6d86d54 100644
--- a/test/perf/masseagerload.py
+++ b/test/perf/masseagerload.py
@@ -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
diff --git a/test/perf/massload.py b/test/perf/massload.py
index f6cde3adf..06cfae786 100644
--- a/test/perf/massload.py
+++ b/test/perf/massload.py
@@ -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 *
 
 """
 
diff --git a/test/perf/masssave.py b/test/perf/masssave.py
index 41acd12cc..3c1547d38 100644
--- a/test/perf/masssave.py
+++ b/test/perf/masssave.py
@@ -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
diff --git a/test/perf/objselectspeed.py b/test/perf/objselectspeed.py
index 816643680..126c9c707 100644
--- a/test/perf/objselectspeed.py
+++ b/test/perf/objselectspeed.py
@@ -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)
diff --git a/test/perf/objupdatespeed.py b/test/perf/objupdatespeed.py
index fad22189a..078d95fa3 100644
--- a/test/perf/objupdatespeed.py
+++ b/test/perf/objupdatespeed.py
@@ -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
diff --git a/test/perf/ormsession.py b/test/perf/ormsession.py
index 0b01fc5a3..aff265ff1 100644
--- a/test/perf/ormsession.py
+++ b/test/perf/ormsession.py
@@ -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):
diff --git a/test/perf/poolload.py b/test/perf/poolload.py
index 62c66fbae..345720f0c 100644
--- a/test/perf/poolload.py
+++ b/test/perf/poolload.py
@@ -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)
diff --git a/test/perf/sessions.py b/test/perf/sessions.py
index 4210732d6..2fe4f758f 100644
--- a/test/perf/sessions.py
+++ b/test/perf/sessions.py
@@ -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.
diff --git a/test/perf/wsgi.py b/test/perf/wsgi.py
index 549c92ade..27aa4a8c8 100644
--- a/test/perf/wsgi.py
+++ b/test/perf/wsgi.py
@@ -4,7 +4,7 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
 import thread
-from sqlalchemy.test import *
+from test.lib import *
 
 port = 8000