Changeset 1710

Timestamp:

08/24/07 12:40:21

Author:

fumanchu

Message:

Moved refleak test into its own module and added it to main test suite.

Files:

• branches/cherrypy-3.0.x/cherrypy/test/test.py (modified) (1 diff)
• branches/cherrypy-3.0.x/cherrypy/test/test_http.py (modified) (3 diffs)
• branches/cherrypy-3.0.x/cherrypy/test/test_refleaks.py (added)

branches/cherrypy-3.0.x/cherrypy/test/test.py

@@ -355 +355 @@
-    
-    testList = [
+        # Run refleak test ASAP to make debugging easier.
+        'test_refleaks',
+        
-        'test_proxy',
-        'test_caching',

branches/cherrypy-3.0.x/cherrypy/test/test_http.py

@@ -9 +9 @@
-test.prefer_parent_path()
-
-import gc
-import httplib
-import threading
-import cherrypy
-from cherrypy import _cprequest
-
-
-data = object()
-
-def get_instances(cls):
-    return [x for x in gc.get_objects() if isinstance(x, cls)]
-
-def setup_server():
@@ -25 +17 @@
-    class Root:
-        def index(self, *args, **kwargs):
-            cherrypy.request.thing = data
-            return "Hello world!"
-        index.exposed = True
-        
-        def gc_stats(self):
-            return "%s %s %s %s" % (gc.collect(),
-                                    len(get_instances(_cprequest.Request)),
-                                    len(get_instances(_cprequest.Response)),
-                                    len(gc.get_referrers(data)))
-        gc_stats.exposed = True
-        
-        def gc_objtypes(self):
-            data = {}
-            for x in gc.get_objects():
-                data[type(x)] = data.get(type(x), 0) + 1
-            
-            data = [(v, k) for k, v in data.iteritems()]
-            data.sort()
-            return "\n".join([repr(pair) for pair in data])
-        gc_objtypes.exposed = True
-    
-    cherrypy.tree.mount(Root())
@@ -63 +37 @@
-
-
-class ReferenceTests(helper.CPWebCase):
-    
-    def test_threadlocal_garbage(self):
-        def getpage():
-            self.getPage('/')
-            self.assertBody("Hello world!")
-        
-        ts = []
-        for _ in range(25):
-            t = threading.Thread(target=getpage)
-            ts.append(t)
-            t.start()
-        
-        for t in ts:
-            t.join()
-        
-        self.getPage("/gc_stats")
-        self.assertBody("0 1 1 1")
-        
-        # If gc_stats fails, choose "ignore" to see the type counts for
-        # all the unreachable objects in this body.
-        self.getPage("/gc_objtypes")
-        self.assertBody("")
-
-
-if __name__ == '__main__':
-    setup_server()