- a new approach to profiling where we attempt to strip out

parts of the pstats that are idiosyncratic to different platforms.
the goal is no per-version assertions on tests, version differences
in theory would go into the list of profiling exceptions.

6 files changed, 48 insertions, 102 deletions

diff --git a/test/aaa_profiling/test_compiler.py b/test/aaa_profiling/test_compiler.py
index 53df3b28e..caa782c3a 100644
--- a/test/aaa_profiling/test_compiler.py
+++ b/test/aaa_profiling/test_compiler.py
@@ -34,21 +34,19 @@ class CompileTest(fixtures.TestBase, AssertsExecutionResults):
 
         cls.dialect = default.DefaultDialect()
 
-    @profiling.function_call_count(versions={'2.7':62, '2.6':62,
-                                            '3':68})
+    @profiling.function_call_count(62)
     def test_insert(self):
         t1.insert().compile(dialect=self.dialect)
 
-    @profiling.function_call_count(versions={'2.6':56, '2.7':56})
+    @profiling.function_call_count(56)
     def test_update(self):
         t1.update().compile(dialect=self.dialect)
 
-    @profiling.function_call_count(versions={'2.6':117, '2.7':117, '3':124})
+    @profiling.function_call_count(110)
     def test_update_whereclause(self):
         t1.update().where(t1.c.c2==12).compile(dialect=self.dialect)
 
-    @profiling.function_call_count(versions={'2.7':148, '2.6':148,
-                                                '3':161})
+    @profiling.function_call_count(148)
     def test_select(self):
         s = select([t1], t1.c.c2==t2.c.c1)
         s.compile(dialect=self.dialect)
diff --git a/test/aaa_profiling/test_orm.py b/test/aaa_profiling/test_orm.py
index b29b4b36e..920d6ee9d 100644
--- a/test/aaa_profiling/test_orm.py
+++ b/test/aaa_profiling/test_orm.py
@@ -14,11 +14,11 @@ class MergeTest(fixtures.MappedTest):
 
     @classmethod
     def define_tables(cls, metadata):
-        parent = Table('parent', metadata, Column('id', Integer,
+        Table('parent', metadata, Column('id', Integer,
                        primary_key=True,
                        test_needs_autoincrement=True), Column('data',
                        String(20)))
-        child = Table('child', metadata, Column('id', Integer,
+        Table('child', metadata, Column('id', Integer,
                       primary_key=True, test_needs_autoincrement=True),
                       Column('data', String(20)), Column('parent_id',
                       Integer, ForeignKey('parent.id'), nullable=False))
@@ -38,8 +38,8 @@ class MergeTest(fixtures.MappedTest):
                                 cls.tables.parent,
                                 cls.tables.child)
 
-        mapper(Parent, parent, properties={'children'
-               : relationship(Child, backref='parent')})
+        mapper(Parent, parent, properties={'children':
+                        relationship(Child, backref='parent')})
         mapper(Child, child)
 
     @classmethod
@@ -47,8 +47,7 @@ class MergeTest(fixtures.MappedTest):
         parent, child = cls.tables.parent, cls.tables.child
 
         parent.insert().execute({'id': 1, 'data': 'p1'})
-        child.insert().execute({'id': 1, 'data': 'p1c1', 'parent_id'
-                               : 1})
+        child.insert().execute({'id': 1, 'data': 'p1c1', 'parent_id': 1})
 
     def test_merge_no_load(self):
         Parent = self.classes.Parent
@@ -61,19 +60,17 @@ class MergeTest(fixtures.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(variance=0.10,
-                versions={'2.7':96, '2.6':96, '2.5':96, '3': 100})
-        def go():
+        @profiling.function_call_count(96, {}, variance=0.10)
+        def go1():
             return sess2.merge(p1, load=False)
-        p2 = go()
+        p2 = go1()
 
         # third call, merge object already present. almost no calls.
 
-        @profiling.function_call_count(variance=0.10,
-                versions={'2.7':16, '2.6':16, '2.5':16, '3': 16})
-        def go():
+        @profiling.function_call_count(16, {}, variance=0.10)
+        def go2():
             return sess2.merge(p2, load=False)
-        p3 = go()
+        go2()
 
     @testing.only_on('sqlite', 'Call counts tailored to pysqlite')
     def test_merge_load(self):
@@ -88,10 +85,7 @@ class MergeTest(fixtures.MappedTest):
         # using sqlite3 the C extension took it back up to approx. 1257
         # (py2.6)
 
-        @profiling.function_call_count(variance=0.10,
-                                versions={'2.7': 1128,
-                                        '3': 1150}
-                            )
+        @profiling.function_call_count(1128, {}, variance=0.10)
         def go():
             p2 = sess2.merge(p1)
         go()
@@ -120,14 +114,14 @@ class LoadManyToOneFromIdentityTest(fixtures.MappedTest):
 
     @classmethod
     def define_tables(cls, metadata):
-        parent = Table('parent', metadata,
+        Table('parent', metadata,
                         Column('id', Integer, primary_key=True),
                        Column('data', String(20)),
                        Column('child_id', Integer, ForeignKey('child.id'))
                        )
 
-        child = Table('child', metadata,
-                    Column('id', Integer,primary_key=True),
+        Table('child', metadata,
+                    Column('id', Integer, primary_key=True),
                   Column('data', String(20))
                  )
 
@@ -174,7 +168,7 @@ class LoadManyToOneFromIdentityTest(fixtures.MappedTest):
         parents = sess.query(Parent).all()
 
 
-        @profiling.function_call_count(108019, variance=.2)
+        @profiling.function_call_count(110761, variance=.2)
         def go():
             for p in parents:
                 p.child
@@ -187,7 +181,7 @@ class LoadManyToOneFromIdentityTest(fixtures.MappedTest):
         parents = sess.query(Parent).all()
         children = sess.query(Child).all()
 
-        @profiling.function_call_count(17987, {'3':18987})
+        @profiling.function_call_count(16988)
         def go():
             for p in parents:
                 p.child
@@ -229,12 +223,12 @@ class MergeBackrefsTest(fixtures.MappedTest):
     def setup_mappers(cls):
         A, B, C, D = cls.classes.A, cls.classes.B, \
                     cls.classes.C, cls.classes.D
-        a, b, c, d= cls.tables.a, cls.tables.b, \
+        a, b, c, d = cls.tables.a, cls.tables.b, \
                     cls.tables.c, cls.tables.d
         mapper(A, a, properties={
-            'bs':relationship(B, backref='a'),
-            'c':relationship(C, backref='as'),
-            'ds':relationship(D, backref='a'),
+            'bs': relationship(B, backref='a'),
+            'c': relationship(C, backref='as'),
+            'ds': relationship(D, backref='a'),
         })
         mapper(B, b)
         mapper(C, c)
diff --git a/test/aaa_profiling/test_pool.py b/test/aaa_profiling/test_pool.py
index 27967884f..da4196549 100644
--- a/test/aaa_profiling/test_pool.py
+++ b/test/aaa_profiling/test_pool.py
@@ -32,10 +32,7 @@ class QueuePoolTest(fixtures.TestBase, AssertsExecutionResults):
     # probably
     # due to the event mechanics being established
     # or not already...
-    @profiling.function_call_count(72, {'2.4': 68, '2.7':75,
-                                            '2.7+cextension':75,
-                                            '3':62},
-                                            variance=.15)
+    @profiling.function_call_count(72, variance=.15)
     def test_first_connect(self):
         conn = pool.connect()
 
@@ -43,10 +40,7 @@ class QueuePoolTest(fixtures.TestBase, AssertsExecutionResults):
         conn = pool.connect()
         conn.close()
 
-        @profiling.function_call_count(32, {'2.4': 21, '2.7':29,
-                                            '3.2':25,
-                                            '2.7+cextension':29},
-                                            variance=.10)
+        @profiling.function_call_count(29, variance=.10)
         def go():
             conn2 = pool.connect()
             return conn2
@@ -55,7 +49,7 @@ class QueuePoolTest(fixtures.TestBase, AssertsExecutionResults):
     def test_second_samethread_connect(self):
         conn = pool.connect()
 
-        @profiling.function_call_count(6, {'2.4': 4, '3':7})
+        @profiling.function_call_count(6)
         def go():
             return pool.connect()
         c2 = go()
diff --git a/test/aaa_profiling/test_resultset.py b/test/aaa_profiling/test_resultset.py
index 9d6ed5755..d0266e029 100644
--- a/test/aaa_profiling/test_resultset.py
+++ b/test/aaa_profiling/test_resultset.py
@@ -6,7 +6,7 @@ NUM_RECORDS = 1000
 
 
 class ResultSetTest(fixtures.TestBase, AssertsExecutionResults):
-    __requires__ = 'cpython',
+    __requires__ = 'cpython', 'cextensions',
     __only_on__ = 'sqlite'
 
     @classmethod
@@ -34,22 +34,11 @@ class ResultSetTest(fixtures.TestBase, AssertsExecutionResults):
     def teardown(self):
         metadata.drop_all()
 
-    @profiling.function_call_count(versions={
-                                    '2.4': 13214,
-                                    '2.6':14416,
-                                    '2.7':14416,
-                                   '2.6+cextension': 354,
-                                   '2.7+cextension':354})
+    @profiling.function_call_count(354)
     def test_string(self):
         [tuple(row) for row in t.select().execute().fetchall()]
 
-    # sqlite3 returns native unicode.  so shouldn't be an increase here.
-
-    @profiling.function_call_count(versions={
-                                    '2.7':14396,
-                                    '2.6':14396,
-                                   '2.6+cextension': 354,
-                                   '2.7+cextension':354})
+    @profiling.function_call_count(354)
     def test_unicode(self):
         [tuple(row) for row in t2.select().execute().fetchall()]
 
@@ -72,9 +61,7 @@ class ExecutionTest(fixtures.TestBase):
         # ensure initial connect activities complete
         c.execute("select 1")
 
-        @profiling.function_call_count(versions={'2.7':40, '2.6':40, '2.5':35,
-                                                    '2.4':21, '3':40},
-                                            variance=.10)
+        @profiling.function_call_count(40, variance=.10)
         def go():
             c.execute("select 1")
         go()
@@ -85,11 +72,7 @@ class ExecutionTest(fixtures.TestBase):
         # ensure initial connect activities complete
         e.execute("select 1")
 
-        @profiling.function_call_count(versions={'2.4':41, '2.5':65,
-                                                    '2.6':65, '3':61,
-                                                    '2.7':65,
-                                                    '2.6+cextension':65},
-                                            variance=.05)
+        @profiling.function_call_count(65, variance=.05)
         def go():
             e.execute("select 1")
         go()
@@ -119,7 +102,7 @@ class RowProxyTest(fixtures.TestBase):
             return value
         value1, value2 = "x", "y"
         row = self._rowproxy_fixture(
-            [(col1, "a"),(col2, "b")],
+            [(col1, "a"), (col2, "b")],
             [proc1, None],
             seq_factory([value1, value2])
         )
diff --git a/test/aaa_profiling/test_zoomark.py b/test/aaa_profiling/test_zoomark.py
index b8ef4090d..be158613e 100644
--- a/test/aaa_profiling/test_zoomark.py
+++ b/test/aaa_profiling/test_zoomark.py
@@ -365,46 +365,35 @@ class ZooMarkTest(fixtures.TestBase):
         metadata = MetaData(engine)
         engine.connect()
 
-    @profiling.function_call_count(3896, {'2.4': 1711})
+    @profiling.function_call_count(3896)
     def test_profile_1_create_tables(self):
         self.test_baseline_1_create_tables()
 
-    @profiling.function_call_count(5045, {'2.6':5099, '2.4': 3650, '3.2':4699})
+    @profiling.function_call_count(4798)
     def test_profile_1a_populate(self):
         self.test_baseline_1a_populate()
 
-    @profiling.function_call_count(245, {'2.4': 172})
+    @profiling.function_call_count(245)
     def test_profile_2_insert(self):
         self.test_baseline_2_insert()
 
-    @profiling.function_call_count(3118, {'2.7':3333,
-                                        '2.7+cextension':3109, '2.6':3109})
+    @profiling.function_call_count(3118)
     def test_profile_3_properties(self):
         self.test_baseline_3_properties()
 
-    @profiling.function_call_count(11624, {'2.4': 7963, '2.6+cextension'
-                                   : 10736, '2.7+cextension': 10736},
-                                   variance=0.10)
+    @profiling.function_call_count(9700, variance=0.10)
     def test_profile_4_expressions(self):
         self.test_baseline_4_expressions()
 
-    @profiling.function_call_count(1059, {'2.4': 904, '2.6+cextension'
-                                   : 1027, '2.6.4':1167, '2.7+cextension': 1027},
-                                   variance=0.10)
+    @profiling.function_call_count(1059, variance=0.10)
     def test_profile_5_aggregates(self):
         self.test_baseline_5_aggregates()
 
-    @profiling.function_call_count(1788, {'2.4': 1118, '3.2':1647,
-                                        '2.7+cextension':1698})
+    @profiling.function_call_count(1606)
     def test_profile_6_editing(self):
         self.test_baseline_6_editing()
 
-    @profiling.function_call_count(2252, {'2.4': 1673,
-                                            '2.6':2412,
-                                            '2.7':2412,
-                                            '3.2':2396,
-                                            '2.7+cextension':2110,
-                                            '2.6+cextension': 2252})
+    @profiling.function_call_count(2095)
     def test_profile_7_multiview(self):
         self.test_baseline_7_multiview()
 
diff --git a/test/aaa_profiling/test_zoomark_orm.py b/test/aaa_profiling/test_zoomark_orm.py
index 48e326f2c..f5911856e 100644
--- a/test/aaa_profiling/test_zoomark_orm.py
+++ b/test/aaa_profiling/test_zoomark_orm.py
@@ -331,39 +331,27 @@ class ZooMarkTest(fixtures.TestBase):
         session = sessionmaker(engine)()
         engine.connect()
 
-    @profiling.function_call_count(5600, {"3.2":5928}, variance=0.25)
+    @profiling.function_call_count(5600, variance=0.25)
     def test_profile_1_create_tables(self):
         self.test_baseline_1_create_tables()
 
-    @profiling.function_call_count(5786, {'2.7+cextension':5683,
-                                            '2.6+cextension':5992})
+    @profiling.function_call_count(5786)
     def test_profile_1a_populate(self):
         self.test_baseline_1a_populate()
 
-    @profiling.function_call_count(388, {'3.2':388})
+    @profiling.function_call_count(388)
     def test_profile_2_insert(self):
         self.test_baseline_2_insert()
 
-    # this number...
-
-    @profiling.function_call_count(6783, {
-        '2.6': 6058,
-        '2.7': 5922,
-        '2.7+cextension': 5714,
-        '2.6+cextension': 5714,
-        '3.2':5787,
-        })
+    @profiling.function_call_count(5702)
     def test_profile_3_properties(self):
         self.test_baseline_3_properties()
 
-    # and this number go down slightly when using the C extensions
-
-    @profiling.function_call_count(17698, {'2.7+cextension':17698, '2.6': 18943, '2.7':19110, '3.2':19264})
+    @profiling.function_call_count(17698)
     def test_profile_4_expressions(self):
         self.test_baseline_4_expressions()
 
-    @profiling.function_call_count(1172, {'2.6+cextension': 1090,
-                                   '2.7+cextension': 1086},
+    @profiling.function_call_count(1065,
                                    variance=0.1)
     def test_profile_5_aggregates(self):
         self.test_baseline_5_aggregates()