- remove some more 2.4 targets

diff --git a/test/aaa_profiling/test_compiler.py b/test/aaa_profiling/test_compiler.py
index d77624cb510654015ebb7284966c2c24bc3c569f..a5d5d973b38ffe42ce7195fc902240774abdf11f 100644 (file)
--- a/test/aaa_profiling/test_compiler.py
+++ b/test/aaa_profiling/test_compiler.py
@@ -41,7 +41,7 @@ class CompileTest(TestBase, AssertsExecutionResults):
     def test_update(self):
         t1.update().compile(dialect=self.dialect)
 
-    @profiling.function_call_count(versions={'2.6':110, '2.7':110, '2.4': 81, '3':115})
+    @profiling.function_call_count(versions={'2.6':110, '2.7':110, '3':115})
     def test_update_whereclause(self):
         t1.update().where(t1.c.c2==12).compile(dialect=self.dialect)
 

diff --git a/test/aaa_profiling/test_orm.py b/test/aaa_profiling/test_orm.py
index e226454b69aa9b369065d19e198c1a68af2ee5a5..84a9fd0259a0a98d590f43a67432e1af6bc0a9c5 100644 (file)
--- a/test/aaa_profiling/test_orm.py
+++ b/test/aaa_profiling/test_orm.py
@@ -53,16 +53,16 @@ class MergeTest(_base.MappedTest):
         # down from 185 on this this is a small slice of a usually
         # bigger operation so using a small variance
 
-        @profiling.function_call_count(80, variance=0.05,
-                versions={'2.4': 64, '2.5':94, '3': 83})
+        @profiling.function_call_count(variance=0.05,
+                versions={'2.7':80, '2.6':80, '2.5':94, '3': 83})
         def go():
             return sess2.merge(p1, load=False)
         p2 = go()
 
         # third call, merge object already present. almost no calls.
 
-        @profiling.function_call_count(11, variance=0.05,
-                versions={'2.4': 8, '2.5':15, '3': 12})
+        @profiling.function_call_count(variance=0.05,
+                versions={'2.7':11, '2.6':11, '2.5':15, '3': 12})
         def go():
             return sess2.merge(p2, load=False)
         p3 = go()
@@ -79,10 +79,11 @@ class MergeTest(_base.MappedTest):
         # using sqlite3 the C extension took it back up to approx. 1257
         # (py2.6)
 
-        @profiling.function_call_count(1005, 
+        @profiling.function_call_count(
                                 versions={'2.5':1050, '2.6':1050,
                                         '2.6+cextension':1041, 
-                                        '2.4': 763}
+                                        '2.7':1005,
+                                        '3':1005}
                             )
         def go():
             p2 = sess2.merge(p1)

diff --git a/test/lib/profiling.py b/test/lib/profiling.py
index 441fe931dc382e7590098e8665f188b55006499e..8676adf019d4b83e0f574eaf38e8f183a8a24d35 100644 (file)
--- a/test/lib/profiling.py
+++ b/test/lib/profiling.py
@@ -127,6 +127,7 @@ def function_call_count(count=None, versions={}, variance=0.05):
         version_info.pop()
 
     if count is None:
+        print "Warning: no function call count specified for version: '%s'" % py_version
         return lambda fn: fn
     
     @decorator