trying different approaches to test layout. in this one, the testing modules

become an externally usable package but still remains within the main sqlalchemy parent package.
in this system, we use kind of an ugly hack to get the noseplugin imported outside of the
"sqlalchemy" package, while still making it available within sqlalchemy for usage by
third party libraries.

6 files changed, 10 insertions, 10 deletions

diff --git a/test/perf/insertspeed.py b/test/perf/insertspeed.py
index 9b397771d..03d2c4144 100644
--- a/test/perf/insertspeed.py
+++ b/test/perf/insertspeed.py
@@ -1,7 +1,7 @@
 import sys, time
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from test.lib import profiling
+from sqlalchemy.testing import profiling
 
 db = create_engine('sqlite://')
 metadata = MetaData(db)
diff --git a/test/perf/large_flush.py b/test/perf/large_flush.py
index b23de080c..b1ecce852 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 test.lib import profiling
+from sqlalchemy.testing import profiling
 
 class Object(object):
     pass
diff --git a/test/perf/objselectspeed.py b/test/perf/objselectspeed.py
index f64c73c69..c0ed88444 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 test.lib.util import gc_collect
-from test.lib import profiling
+from sqlalchemy.testing.util import gc_collect
+from sqlalchemy.testing import profiling
 
 db = create_engine('sqlite://')
 metadata = MetaData(db)
diff --git a/test/perf/objupdatespeed.py b/test/perf/objupdatespeed.py
index 078d95fa3..98d10180e 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 test.lib import *
-from test.lib.util import gc_collect
+from sqlalchemy.testing import *
+from sqlalchemy.testing.util import gc_collect
 
 
 NUM = 100
diff --git a/test/perf/ormsession.py b/test/perf/ormsession.py
index aff265ff1..5e38d6e80 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 test.lib import *
-from test.lib.profiling import profiled
+from sqlalchemy.testing import *
+from sqlalchemy.testing.profiling import profiled
 
 class Item(object):
     def __repr__(self):
diff --git a/test/perf/sessions.py b/test/perf/sessions.py
index 75106f6ca..80553fe48 100644
--- a/test/perf/sessions.py
+++ b/test/perf/sessions.py
@@ -1,8 +1,8 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-from test.lib.compat import gc_collect
-from test.lib import AssertsExecutionResults, profiling, testing
+from sqlalchemy.testing.compat import gc_collect
+from sqlalchemy.testing import AssertsExecutionResults, profiling, testing
 from test.orm import _fixtures
 
 # in this test we are specifically looking for time spent in the attributes.InstanceState.__cleanup() method.