From e0afaa147fcbb827165b87d12f5adb24ab8587a6 Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Fri, 4 Dec 2009 22:03:27 -0800 Subject: [PATCH] Hurf durf merge conflict. --- tests/nosewrapper.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/nosewrapper.py b/tests/nosewrapper.py index 852f222..584f4f4 100644 --- a/tests/nosewrapper.py +++ b/tests/nosewrapper.py @@ -16,11 +16,11 @@ else: # hudson does a better job printing the test results if the exit value is 0 zero_status = '--force-zero-status' -if zero_status in sys.argv: - sys.argv.remove(zero_status) +if zero_status in argv: + argv.remove(zero_status) launch = nose.run else: launch = nose.main from tests import eventlethub -launch(addplugins=[eventlethub.EventletHub()]) +launch(addplugins=[eventlethub.EventletHub()], argv=argv)