- testbase is gone, replaced by testenv

- Importing testenv has no side effects- explicit functions provide similar behavior to the old immediate behavior of testbase
- testing.db has the configured db
- Fixed up the perf/* scripts

1 files changed, 36 insertions, 36 deletions

diff --git a/test/orm/memusage.py b/test/orm/memusage.py
index f0fba3123..93093365b 100644
--- a/test/orm/memusage.py
+++ b/test/orm/memusage.py
@@ -1,4 +1,4 @@
-import testbase
+import testenv; testenv.configure_for_tests()
 import gc
 from sqlalchemy import MetaData, Integer, String, ForeignKey
 from sqlalchemy.orm import mapper, relation, clear_mappers, create_session
@@ -29,21 +29,21 @@ def profile_memory(func):
     return profile
 
 class MemUsageTest(AssertMixin):
-    
+
     def test_session(self):
-        metadata = MetaData(testbase.db)
+        metadata = MetaData(testing.db)
 
-        table1 = Table("mytable", metadata, 
+        table1 = Table("mytable", metadata,
             Column('col1', Integer, primary_key=True),
             Column('col2', String(30))
             )
 
-        table2 = Table("mytable2", metadata, 
+        table2 = Table("mytable2", metadata,
             Column('col1', Integer, primary_key=True),
             Column('col2', String(30)),
             Column('col3', Integer, ForeignKey("mytable.col1"))
             )
-    
+
         metadata.create_all()
 
         m1 = mapper(A, table1, properties={
@@ -52,7 +52,7 @@ class MemUsageTest(AssertMixin):
         m2 = mapper(B, table2)
 
         m3 = mapper(A, table1, non_primary=True)
-        
+
         @profile_memory
         def go():
             sess = create_session()
@@ -70,29 +70,29 @@ class MemUsageTest(AssertMixin):
             alist = sess.query(A).all()
             self.assertEquals(
                 [
-                    A(col2="a1", bs=[B(col2="b1"), B(col2="b2")]), 
-                    A(col2="a2", bs=[]), 
+                    A(col2="a1", bs=[B(col2="b1"), B(col2="b2")]),
+                    A(col2="a2", bs=[]),
                     A(col2="a3", bs=[B(col2="b3")])
-                ], 
+                ],
                 alist)
-            
+
             for a in alist:
                 sess.delete(a)
             sess.flush()
         go()
-        
+
         metadata.drop_all()
         clear_mappers()
-        
+
     def test_mapper_reset(self):
-        metadata = MetaData(testbase.db)
+        metadata = MetaData(testing.db)
 
-        table1 = Table("mytable", metadata, 
+        table1 = Table("mytable", metadata,
             Column('col1', Integer, primary_key=True),
             Column('col2', String(30))
             )
 
-        table2 = Table("mytable2", metadata, 
+        table2 = Table("mytable2", metadata,
             Column('col1', Integer, primary_key=True),
             Column('col2', String(30)),
             Column('col3', Integer, ForeignKey("mytable.col1"))
@@ -106,7 +106,7 @@ class MemUsageTest(AssertMixin):
             m2 = mapper(B, table2)
 
             m3 = mapper(A, table1, non_primary=True)
-        
+
             sess = create_session()
             a1 = A(col2="a1")
             a2 = A(col2="a2")
@@ -122,17 +122,17 @@ class MemUsageTest(AssertMixin):
             alist = sess.query(A).all()
             self.assertEquals(
                 [
-                    A(col2="a1", bs=[B(col2="b1"), B(col2="b2")]), 
-                    A(col2="a2", bs=[]), 
+                    A(col2="a1", bs=[B(col2="b1"), B(col2="b2")]),
+                    A(col2="a2", bs=[]),
                     A(col2="a3", bs=[B(col2="b3")])
-                ], 
+                ],
                 alist)
-        
+
             for a in alist:
                 sess.delete(a)
             sess.flush()
             clear_mappers()
-        
+
         metadata.create_all()
         try:
             go()
@@ -140,14 +140,14 @@ class MemUsageTest(AssertMixin):
             metadata.drop_all()
 
     def test_with_inheritance(self):
-        metadata = MetaData(testbase.db)
+        metadata = MetaData(testing.db)
 
-        table1 = Table("mytable", metadata, 
+        table1 = Table("mytable", metadata,
             Column('col1', Integer, primary_key=True),
             Column('col2', String(30))
             )
 
-        table2 = Table("mytable2", metadata, 
+        table2 = Table("mytable2", metadata,
             Column('col1', Integer, ForeignKey('mytable.col1'), primary_key=True),
             Column('col3', String(30)),
             )
@@ -158,10 +158,10 @@ class MemUsageTest(AssertMixin):
                 pass
             class B(A):
                 pass
-            
+
             mapper(A, table1, polymorphic_on=table1.c.col2, polymorphic_identity='a')
             mapper(B, table2, inherits=A, polymorphic_identity='b')
-            
+
             sess = create_session()
             a1 = A()
             a2 = A()
@@ -176,13 +176,13 @@ class MemUsageTest(AssertMixin):
             self.assertEquals(
                 [
                     A(), A(), B(col3='b1'), B(col3='b2')
-                ], 
+                ],
                 alist)
 
             for a in alist:
                 sess.delete(a)
             sess.flush()
-            
+
             # dont need to clear_mappers()
             del B
             del A
@@ -194,18 +194,18 @@ class MemUsageTest(AssertMixin):
             metadata.drop_all()
 
     def test_with_manytomany(self):
-        metadata = MetaData(testbase.db)
+        metadata = MetaData(testing.db)
 
-        table1 = Table("mytable", metadata, 
+        table1 = Table("mytable", metadata,
             Column('col1', Integer, primary_key=True),
             Column('col2', String(30))
             )
 
-        table2 = Table("mytable2", metadata, 
+        table2 = Table("mytable2", metadata,
             Column('col1', Integer, primary_key=True),
             Column('col2', String(30)),
             )
-        
+
         table3 = Table('t1tot2', metadata,
             Column('t1', Integer, ForeignKey('mytable.col1')),
             Column('t2', Integer, ForeignKey('mytable2.col1')),
@@ -239,7 +239,7 @@ class MemUsageTest(AssertMixin):
             self.assertEquals(
                 [
                     A(bs=[B(col2='b1')]), A(bs=[B(col2='b2')])
-                ], 
+                ],
                 alist)
 
             for a in alist:
@@ -256,6 +256,6 @@ class MemUsageTest(AssertMixin):
         finally:
             metadata.drop_all()
 
-    
+
 if __name__ == '__main__':
-    testbase.main()
+    testenv.main()