From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 28 Apr 2013 22:17:15 +0000 (-0400)
Subject: Use weakrefs instead of __del__ in reference cycle test.
X-Git-Tag: v3.1.0~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b28d6051272dac211eac7d9c2b2eeae3d98e936;p=thirdparty%2Ftornado.git

Use weakrefs instead of __del__ in reference cycle test.

This avoids an awkward and otherwise meaningless use of Task(None).
---

diff --git a/tornado/test/gen_test.py b/tornado/test/gen_test.py
index 27c10eefd..a1e09a133 100644
--- a/tornado/test/gen_test.py
+++ b/tornado/test/gen_test.py
@@ -6,6 +6,7 @@ import sys
 import textwrap
 import time
 import platform
+import weakref
 
 from tornado.concurrent import return_future
 from tornado.escape import url_escape
@@ -493,21 +494,21 @@ class GenEngineTest(AsyncTestCase):
 
     @skipNotCPython
     def test_task_refcounting(self):
-        # Task with arguments on CPython should be released immediately after
-        # engine stop. And should not be delayed to garbage collection.
-        class Task(gen.Task):
-            "Task class which count self instances release."
-            released = 0
-            def __del__(self):
-                type(self).released += 1
-
+        # On CPython, tasks and their arguments should be released immediately
+        # without waiting for garbage collection.
         @gen.engine
         def f():
-            yield Task(self.io_loop.add_callback, arg=Task(None))
+            class Foo(object): pass
+            arg = Foo()
+            self.arg_ref = weakref.ref(arg)
+            task = gen.Task(self.io_loop.add_callback, arg=arg)
+            self.task_ref = weakref.ref(task)
+            yield task
             self.stop()
 
         self.run_gen(f)
-        self.assertEqual(Task.released, 2)
+        self.assertIs(self.arg_ref(), None)
+        self.assertIs(self.task_ref(), None)
 
 
 class GenCoroutineTest(AsyncTestCase):