From 4a2459b6bb1bfaaa3779d17bcbf7fb0c8297a8c3 Mon Sep 17 00:00:00 2001 From: rdw Date: Wed, 19 Mar 2008 15:57:50 -0500 Subject: [PATCH] Fixed test_trampoline_timeout. --- eventlet/api.py | 4 ++-- eventlet/api_test.py | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/eventlet/api.py b/eventlet/api.py index ffe6de2..4624541 100644 --- a/eventlet/api.py +++ b/eventlet/api.py @@ -136,8 +136,8 @@ def trampoline(fd, read=None, write=None, timeout=None): def _do_close(fn): hub.remove_descriptor(fn) greenlib.switch(self, exc=socket.error(32, 'Broken pipe')) - def _do_timeout(fn): - hub.remove_descriptor(fn) + def _do_timeout(): + hub.remove_descriptor(fileno) greenlib.switch(self, exc=TimeoutError()) def cb(_fileno): if t is not None: diff --git a/eventlet/api_test.py b/eventlet/api_test.py index 6557554..9e0335f 100644 --- a/eventlet/api_test.py +++ b/eventlet/api_test.py @@ -93,10 +93,7 @@ class TestApi(tests.TestCase): check_hub() - def dont_test_trampoline_timeout(self): - """This test is broken. Please change it's name to test_trampoline_timeout, - and fix the bug (or fix the test) - """ + def test_trampoline_timeout(self): server = api.tcp_listener(('0.0.0.0', 0)) bound_port = server.getsockname()[1]