Merge pull request #7930 from gutsytechster/strict_svn_check

fix(tests/lib): Catch `subprocess.CalledProcessError` in need_executable
pypa · Mar 29, 2020 · 019637c · 019637c
2 parents 03f0ff4 + 315447d
commit 019637c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/news/7924.bugfix b/news/7924.bugfix
@@ -0,0 +1 @@
+Catch ``subprocess.CalledProcessError`` when checking for the presence of executable within ``need_executable`` using pytest.
diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py
@@ -1079,7 +1079,7 @@ def need_executable(name, check_cmd):
     def wrapper(fn):
         try:
             subprocess.check_output(check_cmd)
-        except OSError:
+        except (OSError, subprocess.CalledProcessError):
             return pytest.mark.skip(
                 reason='{name} is not available'.format(name=name))(fn)
         return fn
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Catch ``subprocess.CalledProcessError`` when checking for the presence of executable within ``need_executable`` using pytest.