Special gc.collect() tickling for Jython patch from pjenvey

diff --git a/test/engine/pool.py b/test/engine/pool.py
index fdac6c0d85a51daf5d574b796ad8290acf4ec92e..6f8013ae71dd397293a5ae2b55db966e0c5c4df1 100644 (file)
--- a/test/engine/pool.py
+++ b/test/engine/pool.py
@@ -1,8 +1,8 @@
 import testenv; testenv.configure_for_tests()
-import threading, time, gc
+import threading, time
 from sqlalchemy import pool, interfaces, create_engine
 import testlib.sa as tsa
-from testlib import TestBase, testing
+from testlib import TestBase, gc testing
 
 
 mcid = 1

diff --git a/test/engine/reconnect.py b/test/engine/reconnect.py
index a1b08c6a390881c7c37e6f71a520293c030ea900..e1d5744db52e30482764b79997c7b0758ad8def5 100644 (file)
--- a/test/engine/reconnect.py
+++ b/test/engine/reconnect.py
@@ -2,9 +2,8 @@ import testenv; testenv.configure_for_tests()
 import weakref
 from testlib.sa import select, MetaData, Table, Column, Integer, String, pool
 import testlib.sa as tsa
-from testlib import TestBase, testing, engines
+from testlib import TestBase, testing, engines, gc
 import time
-import gc
 
 class MockDisconnect(Exception):
     pass

diff --git a/test/ext/associationproxy.py b/test/ext/associationproxy.py
index 821ed90721f51d3bc2f612cbbe53a2abb00e6b4f..64683819bc5154fbcefab35c78099bb602751ea0 100644 (file)
--- a/test/ext/associationproxy.py
+++ b/test/ext/associationproxy.py
@@ -1,5 +1,4 @@
 import testenv; testenv.configure_for_tests()
-import gc
 from sqlalchemy import *
 from sqlalchemy.orm import *
 from sqlalchemy.orm.collections import collection

diff --git a/test/orm/_base.py b/test/orm/_base.py
index 0a6ab817912557bab40b48802f9e4b2ec1cd1e8b..310c467912f0018d95805841a254496f9638e487 100644 (file)
--- a/test/orm/_base.py
+++ b/test/orm/_base.py
@@ -1,4 +1,3 @@
-import gc
 import inspect
 import sys
 import types

diff --git a/test/orm/attributes.py b/test/orm/attributes.py
index 772e1bbd0417d22a3ad81ef7d6e9feaf015f206b..be8cbf714cf0f59f473fff4568075a9de4f19234 100644 (file)
--- a/test/orm/attributes.py
+++ b/test/orm/attributes.py
@@ -7,7 +7,6 @@ from sqlalchemy import exc as sa_exc
 from testlib import *
 from testlib.testing import eq_
 from orm import _base
-import gc
 
 # global for pickling tests
 MyTest = None

diff --git a/test/orm/expire.py b/test/orm/expire.py
index c11fb69dfec3da1d5e595513b88859e956415bcb..bbc011f875aee28b87d2f645b238f2a1617cc74a 100644 (file)
--- a/test/orm/expire.py
+++ b/test/orm/expire.py
@@ -1,8 +1,7 @@
 """Attribute/instance expiration, deferral of attributes, etc."""
 
 import testenv; testenv.configure_for_tests()
-import gc
-from testlib import sa, testing
+from testlib import gc, sa, testing
 from testlib.sa import Table, Column, Integer, String, ForeignKey, exc as sa_exc
 from testlib.sa.orm import mapper, relation, create_session, attributes, deferred
 from orm import _base, _fixtures

diff --git a/test/orm/query.py b/test/orm/query.py
index f79a3b19b4262047487ad0ec595cbc1e085c4fa5..0d893031131a6f056a9a962583d729edcfd32d0a 100644 (file)
--- a/test/orm/query.py
+++ b/test/orm/query.py
@@ -1008,7 +1008,6 @@ class DistinctTest(QueryTest):
 
 class YieldTest(QueryTest):
     def test_basic(self):
-        import gc
         sess = create_session()
         q = iter(sess.query(User).yield_per(1).from_statement("select * from users"))
 

diff --git a/test/orm/session.py b/test/orm/session.py
index 818ab03daf50091624c09e2f95602e6a568f823d..dc5bf257844b66ec0eaabf866b688b4da0258160 100644 (file)
--- a/test/orm/session.py
+++ b/test/orm/session.py
@@ -1,9 +1,8 @@
 import testenv; testenv.configure_for_tests()
-import gc
 import inspect
 import pickle
 from sqlalchemy.orm import create_session, sessionmaker, attributes
-from testlib import engines, sa, testing, config
+from testlib import engines, gc, sa, testing, config
 from testlib.sa import Table, Column, Integer, String, Sequence
 from testlib.sa.orm import mapper, relation, backref
 from testlib.testing import eq_
@@ -788,7 +787,6 @@ class SessionTest(_fixtures.FixtureTest):
         user = s.query(User).one()
         user = None
         print s.identity_map
-        import gc
         gc.collect()
         assert len(s.identity_map) == 1
 
@@ -812,7 +810,6 @@ class SessionTest(_fixtures.FixtureTest):
         self.assert_(len(s.identity_map) == 0)
         self.assert_(s.prune() == 0)
         s.flush()
-        import gc
         gc.collect()
         self.assert_(s.prune() == 9)
         self.assert_(len(s.identity_map) == 1)

diff --git a/test/orm/transaction.py b/test/orm/transaction.py
index cad303a0c5edf5b8077dca2ba4f52c8352b3aeab..444a851dd198d9a1b68ea8b7e9a7c1e0b7783a78 100644 (file)
--- a/test/orm/transaction.py
+++ b/test/orm/transaction.py
@@ -6,7 +6,6 @@ from sqlalchemy import exc as sa_exc
 from sqlalchemy.orm import *
 from testlib import *
 from testlib.fixtures import *
-import gc
 
 class TransactionTest(FixtureTest):
     keep_mappers = True

diff --git a/test/perf/masscreate.py b/test/perf/masscreate.py
index ae32f83e2cbbbed3936ac8517d6a308961296f38..10f6514f0e3cee9b7a3b4b4bd8f633b37698cb36 100644 (file)
--- a/test/perf/masscreate.py
+++ b/test/perf/masscreate.py
@@ -2,8 +2,8 @@
 import testenv; testenv.simple_setup()
 
 from sqlalchemy.orm import attributes
+from testlib import gc
 import time
-import gc
 
 manage_attributes = True
 init_attributes = manage_attributes and True

diff --git a/test/perf/masscreate2.py b/test/perf/masscreate2.py
index 25d4b49153cdccdc4e36167d6b2e20486eeb7985..88a4d3c17ec1a73bf9f1e8c162147ab6be4344fb 100644 (file)
--- a/test/perf/masscreate2.py
+++ b/test/perf/masscreate2.py
@@ -1,9 +1,9 @@
 import testenv; testenv.simple_setup()
-import gc
 
 import random, string
 
 from sqlalchemy.orm import attributes
+from testlib import gc
 
 # with this test, run top.  make sure the Python process doenst grow in size arbitrarily.
 

diff --git a/test/perf/massload.py b/test/perf/massload.py
index 9391ead2a54190e31b889cceb4a623232a46ae5d..4e2b05d123b3b3acea27ebe029cc3c12949d6d11 100644 (file)
--- a/test/perf/massload.py
+++ b/test/perf/massload.py
@@ -1,6 +1,5 @@
 import testenv; testenv.configure_for_tests()
 import time
-#import gc
 #import sqlalchemy.orm.attributes as attributes
 from sqlalchemy import *
 from sqlalchemy.orm import *

diff --git a/test/perf/objselectspeed.py b/test/perf/objselectspeed.py
index 896fd4c49472433b9d47caf241ed3808224b3aaa..788bdcd46b3044c18eb03f62a1cf9772bd8e45bd 100644 (file)
--- a/test/perf/objselectspeed.py
+++ b/test/perf/objselectspeed.py
@@ -1,7 +1,8 @@
 import testenv; testenv.simple_setup()
-import time, gc, resource
+import time, resource
 from sqlalchemy import *
 from sqlalchemy.orm import *
+from testlib import gc
 
 
 db = create_engine('sqlite://')

diff --git a/test/perf/objupdatespeed.py b/test/perf/objupdatespeed.py
index a49eb472452b9e9dbe067f175cc4983c7ddd20d4..a6ed83a07df89775c8ce75cd452dad2c317d572d 100644 (file)
--- a/test/perf/objupdatespeed.py
+++ b/test/perf/objupdatespeed.py
@@ -1,5 +1,5 @@
 import testenv; testenv.configure_for_tests()
-import time, gc, resource
+import time, resource
 from sqlalchemy import *
 from sqlalchemy.orm import *
 from testlib import *

diff --git a/test/perf/sessions.py b/test/perf/sessions.py
index c5f7686531f297c61e2a92c68573247a936aef68..9d0e480f89193398680e9445cbbaf399757cf352 100644 (file)
--- a/test/perf/sessions.py
+++ b/test/perf/sessions.py
@@ -3,7 +3,6 @@ from sqlalchemy import *
 from sqlalchemy.orm import *
 from testlib import *
 from testlib import fixtures
-import gc
 
 # in this test we are specifically looking for time spent in the attributes.InstanceState.__cleanup() method.
 

diff --git a/test/profiling/memusage.py b/test/profiling/memusage.py
index 4f65f1d33cb4fcec6c60b5f23241043b253fc07f..fb5df227d670ed3abf25d0fc789f11fb8152c7cc 100644 (file)
--- a/test/profiling/memusage.py
+++ b/test/profiling/memusage.py
@@ -1,10 +1,9 @@
 import testenv; testenv.configure_for_tests()
-import gc
 from sqlalchemy.orm import mapper, relation, create_session, clear_mappers, sessionmaker
 from sqlalchemy.orm.mapper import _mapper_registry
 from sqlalchemy.orm.session import _sessions
 import operator
-from testlib import testing
+from testlib import gc, testing
 from testlib.sa import MetaData, Table, Column, Integer, String, ForeignKey, PickleType
 import sqlalchemy as sa
 from sqlalchemy.sql import column

diff --git a/test/testlib/__init__.py b/test/testlib/__init__.py
index 5dea60322b953d65714b35c469b8f9361f0dfdcb..3996364a070e53a439ca8ddbded0bbbe85fd29c3 100644 (file)
--- a/test/testlib/__init__.py
+++ b/test/testlib/__init__.py
@@ -17,6 +17,7 @@ from testlib.testing import \
 from testlib.orm import mapper
 import testlib.profiling as profiling
 import testlib.engines as engines
+import testlib.sa_gc as gc
 import testlib.requires as requires
 from testlib.compat import _function_named
 
@@ -27,7 +28,7 @@ __all__ = ('testing',
            'rowset',
            'TestBase', 'AssertsExecutionResults', 'ORMTest',
            'AssertsCompiledSQL', 'ComparesTables',
-           'profiling', 'engines',
+           'profiling', 'engines', 'gc',
            '_function_named')