openstack/deb-python-eventlet
Code Issues Proposed changes

Hurf durf merge conflict.

Browse Source
This commit is contained in:
Ryan Williams
2009-12-04 22:03:27 -08:00
parent cb1cc4d0bd
commit e0afaa147f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/nosewrapper.py
View File

@@ -16,11 +16,11 @@ else:
# hudson does a better job printing the test results if the exit value is 0 # hudson does a better job printing the test results if the exit value is 0
zero_status = '--force-zero-status' zero_status = '--force-zero-status'
if zero_status in sys.argv: if zero_status in argv:
sys.argv.remove(zero_status) argv.remove(zero_status)
launch = nose.run launch = nose.run
else: else:
launch = nose.main launch = nose.main
from tests import eventlethub from tests import eventlethub
launch(addplugins=[eventlethub.EventletHub()]) launch(addplugins=[eventlethub.EventletHub()], argv=argv)