diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-11-29 16:35:57 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-11-29 16:35:57 +0100 |
| commit | 8af4ed7b4fb20190ec72e9ab6347e99deabe9bce (patch) | |
| tree | 818e8e21bcacd473b06ef94e5f105115422e9d55 | |
| parent | 743b28ce1155df348bbb828fcb316d57c8704328 (diff) | |
| download | youtube-dl-8af4ed7b4fb20190ec72e9ab6347e99deabe9bce.tar.gz youtube-dl-8af4ed7b4fb20190ec72e9ab6347e99deabe9bce.tar.xz youtube-dl-8af4ed7b4fb20190ec72e9ab6347e99deabe9bce.zip | |
Fix 2.6 nosetests
| -rwxr-xr-x | test/gentests.py | 5 | ||||
| -rw-r--r-- | test/test_download.py | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test/gentests.py b/test/gentests.py index da4e3c2f6..6f82ae8fa 100755 --- a/test/gentests.py +++ b/test/gentests.py @@ -52,13 +52,14 @@ try: 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 0072d4aab..00b9a487b 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -38,13 +38,14 @@ try: 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) |