1. michaelangela
  2. sqlalchemy

Commits

Mike Bayer  committed 928e426

adjustments

  • Participants
  • Parent commits 12c348d
  • Branches default

Comments (0)

Files changed (6)

File test/aaa_profiling/test_compiler.py

View file
     def test_update_whereclause(self):
         t1.update().where(t1.c.c2==12).compile(dialect=self.dialect)
 
-    @profiling.function_call_count(148)
+    @profiling.function_call_count(139)
     def test_select(self):
         s = select([t1], t1.c.c2==t2.c.c1)
         s.compile(dialect=self.dialect)

File test/aaa_profiling/test_orm.py

View file
         # using sqlite3 the C extension took it back up to approx. 1257
         # (py2.6)
 
-        @profiling.function_call_count(1128, variance=0.10)
+        @profiling.function_call_count(1016, variance=.10)
         def go():
             p2 = sess2.merge(p1)
         go()

File test/aaa_profiling/test_resultset.py

View file
     def teardown(self):
         metadata.drop_all()
 
-    @profiling.function_call_count(336)
+    @profiling.function_call_count(316)
     def test_string(self):
         [tuple(row) for row in t.select().execute().fetchall()]
 
-    @profiling.function_call_count(336)
+    @profiling.function_call_count(316)
     def test_unicode(self):
         [tuple(row) for row in t2.select().execute().fetchall()]
 

File test/aaa_profiling/test_zoomark.py

View file
     def test_profile_1_create_tables(self):
         self.test_baseline_1_create_tables()
 
-    @profiling.function_call_count(4377)
+    @profiling.function_call_count(4200)
     def test_profile_1a_populate(self):
         self.test_baseline_1a_populate()
 
     def test_profile_2_insert(self):
         self.test_baseline_2_insert()
 
-    @profiling.function_call_count(2837)
+    @profiling.function_call_count(2700)
     def test_profile_3_properties(self):
         self.test_baseline_3_properties()
 
-    @profiling.function_call_count(9700, variance=0.10)
+    @profiling.function_call_count(8500)
     def test_profile_4_expressions(self):
         self.test_baseline_4_expressions()
 

File test/aaa_profiling/test_zoomark_orm.py

View file
     def test_profile_3_properties(self):
         self.test_baseline_3_properties()
 
-    @profiling.function_call_count(17698)
+    @profiling.function_call_count(16303)
     def test_profile_4_expressions(self):
         self.test_baseline_4_expressions()
 

File test/lib/profiling.py

View file
             return True
         if "threading.py" in pfname:
             return True
+        if "cprocessors" in pfuncname:
+            return True
 
     if (
             "result.py" in pfname or
     if "utf_8.py" in pfname and pfuncname == "decode":
         return True
 
+    # hasattr seems to be inconsistent
+    if "hasattr" in path[-1][2]:
+        return True
+
     if path[-1][2] in (
             "<built-in method exec>",
             "<listcomp>"