floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into mm

Browse Source 
Conflicts:
	src/_pytest/main.py
	src/_pytest/mark/structures.py
	src/_pytest/python.py
	testing/test_main.py
	testing/test_parseopt.py
This commit is contained in:
Bruno Oliveira
2020-02-11 10:32:18 -03:00
committed by Bruno Oliveira
parent 7484e346f9 0ee007ca33
commit 78baa7b575
31 changed files with 161 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
testing/test_parseopt.py
View File

@@ -1,7 +1,7 @@
import argparse
import distutils.spawn
import os
import shlex
import shutil
import sys
import py
@@ -288,7 +288,7 @@ class TestParser:
def test_argcomplete(testdir, monkeypatch) -> None:
if not distutils.spawn.find_executable("bash"):
if not shutil.which("bash"):
pytest.skip("bash not available")
script = str(testdir.tmpdir.join("test_argcomplete"))