- Re-tuned call counts for 2.3 through 2.5.

diff --git a/test/profiling/compiler.py b/test/profiling/compiler.py
index 1960a1cb6ad8410c31341653b24a4bb1746eda09..7062a7e292a70adbdbb382b35bdf995112e26f6b 100644 (file)
--- a/test/profiling/compiler.py
+++ b/test/profiling/compiler.py
@@ -23,7 +23,7 @@ class CompileTest(TestBase, AssertsExecutionResults):
     def test_update(self):
         t1.update().compile()
 
-    @profiling.function_call_count(120, versions={'2.3': 180, '2.4':123})
+    @profiling.function_call_count(120, versions={'2.3': 153, '2.4':116})
     def test_select(self):
         s = select([t1], t1.c.c2==t2.c.c1)
         s.compile()

diff --git a/test/profiling/zoomark.py b/test/profiling/zoomark.py
index f2e9f8bc8997ee498dba3c4b403b98847892d735..1606b8103f936e251a55b0b5ed5a0db33261a6e6 100644 (file)
--- a/test/profiling/zoomark.py
+++ b/test/profiling/zoomark.py
@@ -12,6 +12,8 @@ from testlib import *
 
 ITERATIONS = 1
 
+# Use with conditional_call_count() if VM state of a full-suite run
+# throws off profiling numbers.
 _run_type = 'suite'
 _running_in = lambda: _run_type
 
@@ -26,9 +28,7 @@ class ZooMarkTest(testing.TestBase, AssertsExecutionResults):
     __only_on__ = 'postgres'
     __skip_if__ = ((lambda: sys.version_info < (2, 4)), )
 
-    @profiling.conditional_call_count(
-        _running_in, {'isolation': (2038,),
-                      'suite': (1569, {'2.4': 1579}, 0.20)})
+    @profiling.function_call_count(2028)
     def test_1_create_tables(self):
         global metadata
         metadata = MetaData(testing.db)