浏览代码

Fix 2.6 nosetests

Philipp Hagemeister 12 年之前
父节点
当前提交
8af4ed7b4f
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 3 2
      test/gentests.py
  2. 3 2
      test/test_download.py

+ 3 - 2
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)
 

+ 3 - 2
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)