Merge pull request #7526 from bluetech/win-bash-2

testing: improve bash check
pytest-dev · Jul 22, 2020 · 2a8dcc9 · 2a8dcc9
2 parents dbc50a7 + 0709305
commit 2a8dcc9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/testing/test_parseopt.py b/testing/test_parseopt.py
@@ -292,10 +292,11 @@ def test_argcomplete(testdir, monkeypatch) -> None:
         bash_version = subprocess.run(
             ["bash", "--version"],
             stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
+            stderr=subprocess.DEVNULL,
+            check=True,
             universal_newlines=True,
         ).stdout
-    except OSError:
+    except (OSError, subprocess.CalledProcessError):
         pytest.skip("bash is not available")
     if "GNU bash" not in bash_version:
         # See #7518.