diff options
Diffstat (limited to 'test/aaa_profiling/test_memusage.py')
| -rw-r--r-- | test/aaa_profiling/test_memusage.py | 138 |
1 files changed, 73 insertions, 65 deletions
diff --git a/test/aaa_profiling/test_memusage.py b/test/aaa_profiling/test_memusage.py index 59564e5bb..494e078ab 100644 --- a/test/aaa_profiling/test_memusage.py +++ b/test/aaa_profiling/test_memusage.py @@ -112,73 +112,76 @@ def profile_memory( max_grew_for = 0 success = False until_maxtimes = 0 - while True: - if until_maxtimes >= maxtimes // 5: - break - for x in range(5): - try: - func(*func_args) - except Exception as err: - queue.put( - ( - "result", - False, - "Test raised an exception: %r" % err, + try: + while True: + if until_maxtimes >= maxtimes // 5: + break + for x in range(5): + try: + func(*func_args) + except Exception as err: + queue.put( + ( + "result", + False, + "Test raised an exception: %r" % err, + ) ) - ) - raise - gc_collect() - samples.append( - get_num_objects() - if get_num_objects is not None - else len(get_objects_skipping_sqlite_issue()) - ) + raise + gc_collect() + samples.append( + get_num_objects() + if get_num_objects is not None + else len(get_objects_skipping_sqlite_issue()) + ) - if assert_no_sessions: - assert len(_sessions) == 0 + if assert_no_sessions: + assert len(_sessions) == 0, "sessions remain" - # queue.put(('samples', samples)) + # queue.put(('samples', samples)) - latest_max = max(samples[-5:]) - if latest_max > max_: - queue.put( - ( - "status", - "Max grew from %s to %s, max has " - "grown for %s samples" - % (max_, latest_max, max_grew_for), + latest_max = max(samples[-5:]) + if latest_max > max_: + queue.put( + ( + "status", + "Max grew from %s to %s, max has " + "grown for %s samples" + % (max_, latest_max, max_grew_for), + ) ) - ) - max_ = latest_max - max_grew_for += 1 - until_maxtimes += 1 - continue - else: + max_ = latest_max + max_grew_for += 1 + until_maxtimes += 1 + continue + else: + queue.put( + ( + "status", + "Max remained at %s, %s more attempts left" + % (max_, max_grew_for), + ) + ) + max_grew_for -= 1 + if max_grew_for == 0: + success = True + break + except Exception as err: + queue.put(("result", False, "got exception: %s" % err)) + else: + if not success: queue.put( ( - "status", - "Max remained at %s, %s more attempts left" - % (max_, max_grew_for), + "result", + False, + "Ran for a total of %d times, memory kept " + "growing: %r" % (maxtimes, samples), ) ) - max_grew_for -= 1 - if max_grew_for == 0: - success = True - break - if not success: - queue.put( - ( - "result", - False, - "Ran for a total of %d times, memory kept " - "growing: %r" % (maxtimes, samples), - ) - ) - - else: - queue.put(("result", True, "success")) + else: + queue.put(("result", True, "success")) def run_in_process(*func_args): queue = multiprocessing.Queue() @@ -1293,8 +1296,10 @@ class CycleTest(_fixtures.FixtureTest): s.query(User).options(joinedload(User.addresses)).all() # cycles here are due to ClauseElement._cloned_set and Load.context, - # others as of cache key - @assert_cycles(29) + # others as of cache key. The options themselves are now part of + # QueryCompileState which is not eagerly disposed yet, so this + # adds some more. + @assert_cycles(36) def go(): generate() @@ -1317,7 +1322,7 @@ class CycleTest(_fixtures.FixtureTest): @assert_cycles(7) def go(): s = select([users]).select_from(users.join(addresses)) - state = s._compile_state_factory(s, None) + state = s._compile_state_factory(s, s.compile()) state.froms go() @@ -1363,7 +1368,7 @@ class CycleTest(_fixtures.FixtureTest): stmt = s.query(User).join(User.addresses).statement - @assert_cycles() + @assert_cycles(4) def go(): result = s.execute(stmt) while True: @@ -1381,7 +1386,7 @@ class CycleTest(_fixtures.FixtureTest): stmt = s.query(User).join(User.addresses).statement - @assert_cycles() + @assert_cycles(4) def go(): result = s.execute(stmt) rows = result.fetchall() # noqa @@ -1396,7 +1401,7 @@ class CycleTest(_fixtures.FixtureTest): stmt = s.query(User).join(User.addresses).statement - @assert_cycles() + @assert_cycles(4) def go(): result = s.execute(stmt) for partition in result.partitions(3): @@ -1412,7 +1417,7 @@ class CycleTest(_fixtures.FixtureTest): stmt = s.query(User).join(User.addresses).statement - @assert_cycles() + @assert_cycles(4) def go(): result = s.execute(stmt) for partition in result.unique().partitions(3): @@ -1420,7 +1425,7 @@ class CycleTest(_fixtures.FixtureTest): go() - def test_core_select(self): + def test_core_select_from_orm_query(self): User, Address = self.classes("User", "Address") configure_mappers() @@ -1428,7 +1433,10 @@ class CycleTest(_fixtures.FixtureTest): stmt = s.query(User).join(User.addresses).statement - @assert_cycles() + # ORM query using future select for .statement is adding + # some ORMJoin cycles here during compilation. not worth trying to + # find it + @assert_cycles(4) def go(): s.execute(stmt) |