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

Merge pull request #6119 from blueyed/FSCollector-fspath 

FSCollector: keep/use given fspath
This commit is contained in:
Daniel Hahler 2019-11-06 13:10:27 +01:00 committed by GitHub
parent e7320c6b54 0c7c26fe6e
commit 9071a2a5e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/_pytest/nodes.py
View File

@ -383,8 +383,9 @@ def _check_initialpaths_for_relpath(session, fspath):
class FSCollector(Collector): class FSCollector(Collector):
def __init__(self, fspath, parent=None, config=None, session=None, nodeid=None): def __init__(
fspath = py.path.local(fspath) # xxx only for test_resultlog.py? self, fspath: py.path.local, parent=None, config=None, session=None, nodeid=None
) -> None:
name = fspath.basename name = fspath.basename
if parent is not None: if parent is not None:
rel = fspath.relto(parent.fspath) rel = fspath.relto(parent.fspath)