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

cope with ANY error when importing pytest into borg.testsuite, #4652
2019-07-02 22:47:42 +02:00 · 2019-07-02 22:47:42 +02:00 · b29dc81fa8
parent 737869449c 9cfba91cc6
commit b29dc81fa8
1 changed files with 1 additions and 1 deletions
--- a/src/borg/testsuite/init.py
+++ b/src/borg/testsuite/init.py
@ -27,7 +27,7 @@ except ImportError:

 try:
    from pytest import raises
-except ImportError:
+except:  # noqa
    raises = None

 has_lchflags = hasattr(os, 'lchflags') or sys.platform.startswith('linux')