Commits

Robert Brewer committed 3932b98

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

Comments (0)

Files changed (1)

cherrypy/test/test_http.py

 import test
 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
 cherrypy.tree.mount(Root())
             self.assertEqual(c.getresponse().status, 411)
 
 
+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")
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.