From 8af4ed7b4fb20190ec72e9ab6347e99deabe9bce Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 29 Nov 2012 16:35:57 +0100 Subject: [PATCH] Fix 2.6 nosetests --- test/gentests.py | 5 +++-- test/test_download.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/gentests.py b/test/gentests.py index da4e3c2f68..6f82ae8fa6 100755 --- a/test/gentests.py +++ b/test/gentests.py @@ -52,13 +52,14 @@ def md5_for_file(filename, block_size=2**20): except AttributeError: # Python 2.6 def _skip_unless(cond, reason='No reason given'): def resfunc(f): - def wfunc(*args, **kwargs): + # Start the function name with test to appease nosetests-2.6 + def test_wfunc(*args, **kwargs): if cond: return f(*args, **kwargs) else: print('Skipped test') return - return wfunc + return test_wfunc return resfunc _skip = lambda *args, **kwargs: _skip_unless(False, *args, **kwargs) diff --git a/test/test_download.py b/test/test_download.py index 0072d4aabd..00b9a487bc 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -38,13 +38,14 @@ def md5_for_file(filename, block_size=2**20): except AttributeError: # Python 2.6 def _skip_unless(cond, reason='No reason given'): def resfunc(f): - def wfunc(*args, **kwargs): + # Start the function name with test to appease nosetests-2.6 + def test_wfunc(*args, **kwargs): if cond: return f(*args, **kwargs) else: print('Skipped test') return - return wfunc + return test_wfunc return resfunc _skip = lambda *args, **kwargs: _skip_unless(False, *args, **kwargs)