summaryrefslogtreecommitdiff
path: root/test/orm/entity.py
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2008-01-12 22:03:42 +0000
committerJason Kirtland <jek@discorporate.us>2008-01-12 22:03:42 +0000
commit17d3c8764e020379e54053bca0b0a2bc71d48aa0 (patch)
tree0b46f1ddc57292b8f5bfbc28ab1679230f63e426 /test/orm/entity.py
parentc194962019d1bc7322e20b82c33aa1bab3bc2a28 (diff)
downloadsqlalchemy-17d3c8764e020379e54053bca0b0a2bc71d48aa0.tar.gz
- 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
Diffstat (limited to 'test/orm/entity.py')
-rw-r--r--test/orm/entity.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/orm/entity.py b/test/orm/entity.py
index 7011fa3e0..c56d22f9d 100644
--- a/test/orm/entity.py
+++ b/test/orm/entity.py
@@ -1,4 +1,4 @@
-import testbase
+import testenv; testenv.configure_for_tests()
from sqlalchemy import *
from sqlalchemy.orm import *
from sqlalchemy.ext.sessioncontext import SessionContext
@@ -12,7 +12,7 @@ class EntityTest(AssertMixin):
@testing.uses_deprecated('SessionContext')
def setUpAll(self):
global user1, user2, address1, address2, metadata, ctx
- metadata = MetaData(testbase.db)
+ metadata = MetaData(testing.db)
ctx = SessionContext(create_session)
user1 = Table('user1', metadata,
@@ -216,4 +216,4 @@ class EntityTest(AssertMixin):
if __name__ == "__main__":
- testbase.main()
+ testenv.main()