浏览代码

Merge pull request #4659 from ThomasWaldmann/pytest-failsafe-1.1

cope with ANY error when importing pytest into borg.testsuite, #4652
TW 6 年之前
父节点
当前提交
b29dc81fa8
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      src/borg/testsuite/__init__.py

+ 1 - 1
src/borg/testsuite/__init__.py

@@ -27,7 +27,7 @@ except ImportError:
 
 
 try:
 try:
     from pytest import raises
     from pytest import raises
-except ImportError:
+except:  # noqa
     raises = None
     raises = None
 
 
 has_lchflags = hasattr(os, 'lchflags') or sys.platform.startswith('linux')
 has_lchflags = hasattr(os, 'lchflags') or sys.platform.startswith('linux')