Fix 2.6 nosetests

diff --git a/test/gentests.py b/test/gentests.py
index da4e3c2f68d4dbcf7f1f420304e8acc58356c509..6f82ae8fa61f621235cc83561b55ddf8b9fbb9ed 100755 (executable)
--- 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 0072d4aabddafbde55ba6a1142e8e47ac6ba8dcc..00b9a487bc6acee80216d1328bdf70ef5a1e9dc4 100644 (file)
--- 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)