misc cleanups in tests (courtesy of Michael Bayer's revisiting of my

patch)

diff --git a/test/perf/masseagerload.py b/test/perf/masseagerload.py
index 88a3ade20b19fe3ffabfb1262c72eda6c10ef587..83140643c3852b5d725f12ab1f3114cdb8215aea 100644 (file)
--- a/test/perf/masseagerload.py
+++ b/test/perf/masseagerload.py
@@ -1,11 +1,12 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from sqlalchemy.test import *
+from sqlalchemy.test import profiling
 
 NUM = 500
 DIVISOR = 50
 
-meta = MetaData(testing.db)
+engine = create_engine('sqlite://')
+meta = MetaData(engine)
 items = Table('items', meta,
               Column('item_id', Integer, primary_key=True),
               Column('value', String(100)))

diff --git a/test/perf/threaded_compile.py b/test/perf/threaded_compile.py
index 6809f2560d05080e47aa2e9f0d7063ef21117cac..e0252403ad00094215f1e96359b31de79f86726c 100644 (file)
--- a/test/perf/threaded_compile.py
+++ b/test/perf/threaded_compile.py
@@ -2,7 +2,6 @@
 when additional mappers are created while the existing
 collection is being compiled."""
 
-import testenv; testenv.simple_setup()
 from sqlalchemy import *
 from sqlalchemy.orm import *
 import thread, time