summaryrefslogtreecommitdiff
path: root/test/profiling
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-05-19 22:35:32 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-05-19 22:35:32 +0000
commitad23f3b068554aaf21d71b6f288ec0cf3fe81696 (patch)
tree99e370fb9ba11d7eda47890a169aee73ccf17a73 /test/profiling
parentced326dc1f8f60c97887d2735ca22b31520d93a5 (diff)
downloadsqlalchemy-ad23f3b068554aaf21d71b6f288ec0cf3fe81696.tar.gz
- zoomark/zoomark_orm seem to work with pool_threadlocal turned off, [ticket:1050] becomes WORKSFORME
- fixed probably errenous unique=True checkin on unitofwork.py
Diffstat (limited to 'test/profiling')
-rw-r--r--test/profiling/zoomark.py10
-rw-r--r--test/profiling/zoomark_orm.py2
2 files changed, 6 insertions, 6 deletions
diff --git a/test/profiling/zoomark.py b/test/profiling/zoomark.py
index 69f236ef1..e0d696ae4 100644
--- a/test/profiling/zoomark.py
+++ b/test/profiling/zoomark.py
@@ -35,7 +35,7 @@ class ZooMarkTest(TestBase):
creator = testing.db.pool._creator
recorder = lambda: dbapi_session.recorder(creator())
- engine = engines.testing_engine(options={'creator':recorder, 'pool_threadlocal':True}) # TODO: shouldnt need threadlocal pool
+ engine = engines.testing_engine(options={'creator':recorder})
metadata = MetaData(engine)
def test_baseline_1_create_tables(self):
@@ -317,7 +317,7 @@ class ZooMarkTest(TestBase):
global metadata
player = lambda: dbapi_session.player()
- engine = create_engine('postgres:///', creator=player, pool_threadlocal=True) # TODO: shouldnt need threadlocal pool
+ engine = create_engine('postgres:///', creator=player)
metadata = MetaData(engine)
@profiling.function_call_count(3230, {'2.4': 1796})
@@ -336,15 +336,15 @@ class ZooMarkTest(TestBase):
def test_profile_3_properties(self):
self.test_baseline_3_properties()
- @profiling.function_call_count(18119, {'2.4': 10549})
+ @profiling.function_call_count(17098, {'2.4': 10549})
def test_profile_4_expressions(self):
self.test_baseline_4_expressions()
- @profiling.function_call_count(1617, {'2.4': 1032})
+ @profiling.function_call_count(1523, {'2.4': 1032})
def test_profile_5_aggregates(self):
self.test_baseline_5_aggregates()
- @profiling.function_call_count(1882, {'2.4': 1048})
+ @profiling.function_call_count(2054, {'2.4': 1048})
def test_profile_6_editing(self):
self.test_baseline_6_editing()
diff --git a/test/profiling/zoomark_orm.py b/test/profiling/zoomark_orm.py
index 98b616efa..f347be52c 100644
--- a/test/profiling/zoomark_orm.py
+++ b/test/profiling/zoomark_orm.py
@@ -38,7 +38,7 @@ class ZooMarkTest(TestBase):
recorder = lambda: dbapi_session.recorder(creator())
engine = engines.testing_engine(options={'creator':recorder})
metadata = MetaData(engine)
- session = sessionmaker(bind=engine)() # the recorder seems to have a dependency on being bound to the engine here
+ session = sessionmaker()()
def test_baseline_1_create_tables(self):
zoo = Table('Zoo', metadata,