openstack/deb-python-eventlet
Code Issues Proposed changes

Fixing ftplib test failures.

Browse Source
This commit is contained in:
Ryan Williams
2010-07-29 12:18:28 -07:00
parent 27ff9d1bba
commit 7e91a215dd
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/stdlib/all.py
View File

@@ -9,9 +9,11 @@ debug.hub_prevent_multiple_readers(False)
def restart_hub(): def restart_hub():
from eventlet import hubs from eventlet import hubs
hub = hubs.get_hub() hub = hubs.get_hub()
hub.abort()
hub_shortname = hub.__module__.split('.')[-1] hub_shortname = hub.__module__.split('.')[-1]
hubs.use_hub(hub_shortname) # don't restart the pyevent hub; it's not necessary
if hub_shortname != 'pyevent':
hub.abort()
hubs.use_hub(hub_shortname)
def assimilate_patched(name): def assimilate_patched(name):
try: try:

3
tests/stdlib/test_ftplib.py
View File

@@ -4,8 +4,7 @@ from eventlet.green import ftplib
from eventlet.green import threading from eventlet.green import threading
from eventlet.green import socket from eventlet.green import socket
patcher.inject('test.test_ftplib', patcher.inject('test.test_ftplib', globals())
globals())
if __name__ == "__main__": if __name__ == "__main__":
test_main() test_main()