Changeset 1012

Timestamp:

03/22/06 02:03:15

Author:

fumanchu

Message:

Test for #496 (memory leak in thread locals).

Files:

• trunk/cherrypy/test/test_http.py (modified) (2 diffs)

trunk/cherrypy/test/test_http.py

@@ -10 +10 @@
-test.prefer_parent_path()
-
+import gc
-import httplib
+import threading
-import cherrypy
+from cherrypy import _cphttptools
-
+
+data = object()
-
-class Root:
-    def index(self, *args, **kwargs):
+        cherrypy.thread_data.thing = data
-        return "Hello world!"
-    index.exposed = True
@@ -41 +47 @@
-
-
+def get_instances(cls):
+    return [x for x in gc.get_objects() if isinstance(x, cls)]
+
+
+class ReferenceTests(helper.CPWebCase):
+    
+    def test_threadlocal_garbage(self):
+        def getpage():
+            self.getPage('/')
+            self.assertBody("Hello world!")
+        
+        ts = []
+        for _ in range(100):
+            t = threading.Thread(target=getpage)
+            ts.append(t)
+            t.start()
+        
+        for t in ts:
+            t.join()
+        
+        self.assertEqual(gc.collect(), 0)
+        self.assertEqual(len(get_instances(_cphttptools.Request)), 0)
+        self.assertEqual(len(get_instances(_cphttptools.Response)), 0)
+        self.assertEqual(len(gc.get_referrers(data)), 1)
+
+
-if __name__ == '__main__':
-    helper.testmain(server="cherrypy._cpwsgi.WSGIServer")