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/_code/code.py
 * 	src/_pytest/main.py
 * 	testing/python/metafunc.py
 * 	testing/test_parseopt.py
 * 	testing/test_pytester.py
This commit is contained in:
Bruno Oliveira
2020-01-22 11:03:45 -03:00
parent 2f0d0fb349 8c4dfca0c1
commit 93b74d28d2
53 changed files with 641 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
testing/test_collection.py
View File

@@ -243,7 +243,7 @@ class TestCollectPluginHookRelay:
wascalled = []
class Plugin:
def pytest_collect_file(self, path, parent):
def pytest_collect_file(self, path):
if not path.basename.startswith("."):
# Ignore hidden files, e.g. .testmondata.
wascalled.append(path)
@@ -257,7 +257,7 @@ class TestCollectPluginHookRelay:
wascalled = []
class Plugin:
def pytest_collect_directory(self, path, parent):
def pytest_collect_directory(self, path):
wascalled.append(path.basename)
testdir.mkdir("hello")
@@ -1210,7 +1210,7 @@ def test_collect_symlink_out_of_tree(testdir):
assert result.ret == 0
def test_collectignore_via_conftest(testdir, monkeypatch):
def test_collectignore_via_conftest(testdir):
"""collect_ignore in parent conftest skips importing child (issue #4592)."""
tests = testdir.mkpydir("tests")
tests.ensure("conftest.py").write("collect_ignore = ['ignore_me']")