Fixed #54 -- Do not leak on_done handlers. (#195)

circuits · Jan 16, 2017 · 930ca39 · 930ca39
1 parent 711973e
commit 930ca39
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 2 deletions.
diff --git a/circuits/core/manager.py b/circuits/core/manager.py
@@ -544,8 +544,7 @@ def _on_tick(self):
 
         yield state
 
-        if not state.timeout:
-            self.removeHandler(_on_done_handler, "%s_done" % event_name)
+        self.removeHandler(_on_done_handler, "%s_done" % event_name)
 
         if state.event is not None:
             yield CallValue(state.event.value)

diff --git a/tests/core/test_memory_leaks.py b/tests/core/test_memory_leaks.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+import pytest
+
+from circuits import handler, Component, Event
+
+
+class call(Event):
+
+    """call Event"""
+    success = True
+
+
+class hello(Event):
+
+    """hello Event"""
+    success = True
+
+
+class App(Component):
+    @handler("call")
+    def _on_call(self):
+        x = yield self.call(hello())
+        yield x.value
+
+    def hello(self):
+        return "Hello World!"
+
+
+@pytest.fixture
+def app(request, manager, watcher):
+    app = App().register(manager)
+    assert watcher.wait("registered")
+
+    def finalizer():
+        app.unregister()
+
+    request.addfinalizer(finalizer)
+
+    return app
+
+
+def test_done_handlers_dont_leak(manager, watcher, app):
+    manager.fire(call())
+    manager.fire(call())
+    assert watcher.wait("call_success")
+    assert "hello_done" not in app._handlers