openstack/deb-python-eventlet
Code Issues Proposed changes

Added silent timer support to pyevent hub, upgraded api_test to use actual unit test primitives rather than inventing its own.

Browse Source
This commit is contained in:
Ryan Williams
2010-01-08 12:39:10 -08:00
parent a868b1c857
commit d33bb039e2
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eventlet/hubs/pyevent.py
View File

@@ -96,7 +96,8 @@ class Hub(BaseHub):
self.schedule_call_global(0, api.getcurrent().parent.throw, *self.signal_exc_info) self.schedule_call_global(0, api.getcurrent().parent.throw, *self.signal_exc_info)
self.signal_exc_info = None self.signal_exc_info = None
else: else:
traceback.print_exc() if not self.silent_timer_exceptions:
traceback.print_exc()
def abort(self): def abort(self):
self.schedule_call_global(0, self.greenlet.throw, api.GreenletExit) self.schedule_call_global(0, self.greenlet.throw, api.GreenletExit)

6
tests/api_test.py
View File

@@ -210,12 +210,12 @@ class TestApi(TestCase):
state.append('finished') state.append('finished')
g = api.spawn(test) g = api.spawn(test)
api.sleep(DELAY/2) api.sleep(DELAY/2)
assert state == ['start'], state self.assertEquals(state, ['start'])
api.kill(g) api.kill(g)
# will not get there, unless switching is explicitly scheduled by kill # will not get there, unless switching is explicitly scheduled by kill
assert state == ['start', 'except'], state self.assertEquals(state,['start', 'except'])
api.sleep(DELAY) api.sleep(DELAY)
assert state == ['start', 'except', 'finished'], state self.assertEquals(state, ['start', 'except', 'finished'])
def test_nested_with_timeout(self): def test_nested_with_timeout(self):
def func(): def func():