From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 4 Apr 2020 21:18:46 +0000 (-0400)
Subject: Ensure context.attrbutes dictionary is reset each time
X-Git-Tag: rel_1_4_0b1~420
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=139aac4aba98b170787a63f0f0ca785c1fdfc63b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Ensure context.attrbutes dictionary is reset each time

A memory growth issue was identified in this test which
caused the profiling results to be inaccurate.

Change-Id: I248dcce5833feada947bc91bdf09a8f925d31d65
---

diff --git a/test/aaa_profiling/test_orm.py b/test/aaa_profiling/test_orm.py
index 061c0bff4f..cecb0f240a 100644
--- a/test/aaa_profiling/test_orm.py
+++ b/test/aaa_profiling/test_orm.py
@@ -839,6 +839,8 @@ class JoinedEagerLoadTest(fixtures.MappedTest):
         @profiling.function_call_count()
         def go():
             for i in range(100):
+                # make sure these get reset each time
+                context.attributes = q._attributes.copy()
                 obj = q._execute_and_instances(context)
                 list(obj)
                 sess.close()
diff --git a/test/profiles.txt b/test/profiles.txt
index 9133d63011..62605ec0d3 100644
--- a/test/profiles.txt
+++ b/test/profiles.txt
@@ -330,10 +330,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 446748
-test.aaa_profiling.test_orm.JoinedEagerLoadTest.test_fetch_results 2.7_sqlite_pysqlite_dbapiunicode_nocextensions 475548
-test.aaa_profiling.test_orm.JoinedEagerLoadTest.test_fetch_results 3.7_sqlite_pysqlite_dbapiunicode_cextensions 452057
-test.aaa_profiling.test_orm.JoinedEagerLoadTest.test_fetch_results 3.7_sqlite_pysqlite_dbapiunicode_nocextensions 482357
+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: test.aaa_profiling.test_orm.LoadManyToOneFromIdentityTest.test_many_to_one_load_identity