repair test_fetch_results

this profiling test was not actually loading the related
objects.

Change-Id: I9d18a44f50f72f6653f736708829365eb561160e
(cherry picked from commit ebe558f956fd63d47e23e3bb56070edab1079e96)
(cherry picked from commit 397cef1f049096de173f9a629b9ab0cfaf25b739)

diff --git a/test/aaa_profiling/test_orm.py b/test/aaa_profiling/test_orm.py
index 6b48c556b2df4bba681a0467148567821392c1b0..9d8b5cf8af8a51f9a01f3f6bfc525a99a2ad362f 100644 (file)
--- a/test/aaa_profiling/test_orm.py
+++ b/test/aaa_profiling/test_orm.py
@@ -829,12 +829,13 @@ class JoinedEagerLoadTest(fixtures.MappedTest):
         )
 
         context = q._compile_context()
+        attributes = dict(context.attributes)
 
         @profiling.function_call_count()
         def go():
             for i in range(100):
                 # make sure these get reset each time
-                context.attributes = q._attributes.copy()
+                context.attributes = attributes.copy()
                 obj = q._execute_and_instances(context)
                 list(obj)
                 sess.close()

diff --git a/test/profiles.txt b/test/profiles.txt
index 70f12c836504f2ec06251195161e5cf5879bdbc9..d3f59aab53c9b6b17e2eb796e59ce740774a1a2e 100644 (file)
--- a/test/profiles.txt
+++ b/test/profiles.txt
@@ -1,15 +1,15 @@
 # /home/classic/dev/sqlalchemy/test/profiles.txt
 # This file is written out on a per-environment basis.
-# For each test in aaa_profiling, the corresponding function and
+# For each test in aaa_profiling, the corresponding function and 
 # environment is located within this file.  If it doesn't exist,
 # the test is skipped.
-# If a callcount does exist, it is compared to what we received.
+# If a callcount does exist, it is compared to what we received. 
 # assertions are raised if the counts do not match.
-#
-# To add a new callcount test, apply the function_call_count
-# decorator and re-run the tests using the --write-profiles
+# 
+# To add a new callcount test, apply the function_call_count 
+# decorator and re-run the tests using the --write-profiles 
 # option - this file will be rewritten including the new count.
-#
+# 
 
 # TEST: test.aaa_profiling.test_compiler.CompileTest.test_insert
 
@@ -409,10 +409,10 @@ test.aaa_profiling.test_orm.JoinedEagerLoadTest.test_build_query 3.7_sqlite_pysq
 
 # TEST: test.aaa_profiling.test_orm.JoinedEagerLoadTest.test_fetch_results
 
-test.aaa_profiling.test_orm.JoinedEagerLoadTest.test_fetch_results 2.7_sqlite_pysqlite_dbapiunicode_cextensions 352152
-test.aaa_profiling.test_orm.JoinedEagerLoadTest.test_fetch_results 2.7_sqlite_pysqlite_dbapiunicode_nocextensions 354552
-test.aaa_profiling.test_orm.JoinedEagerLoadTest.test_fetch_results 3.7_sqlite_pysqlite_dbapiunicode_cextensions 355955
-test.aaa_profiling.test_orm.JoinedEagerLoadTest.test_fetch_results 3.7_sqlite_pysqlite_dbapiunicode_nocextensions 360455
+test.aaa_profiling.test_orm.JoinedEagerLoadTest.test_fetch_results 2.7_sqlite_pysqlite_dbapiunicode_cextensions 452359
+test.aaa_profiling.test_orm.JoinedEagerLoadTest.test_fetch_results 2.7_sqlite_pysqlite_dbapiunicode_nocextensions 455062
+test.aaa_profiling.test_orm.JoinedEagerLoadTest.test_fetch_results 3.7_sqlite_pysqlite_dbapiunicode_cextensions 452359
+test.aaa_profiling.test_orm.JoinedEagerLoadTest.test_fetch_results 3.7_sqlite_pysqlite_dbapiunicode_nocextensions 483257
 
 # TEST: test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_identity