jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Session: collect: keep/use already parsed initialpart (#6120)

This commit is contained in:
Daniel Hahler 2019-11-07 11:16:24 +01:00 committed by GitHub
parent 5be3a9b5ce c4a110b20a
commit 0c0d33f78e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/_pytest/main.py
View File

@ -488,22 +488,22 @@ class Session(nodes.FSCollector):
def collect(self): def collect(self):
for initialpart in self._initialparts: for initialpart in self._initialparts:
arg = "::".join(map(str, initialpart)) self.trace("processing argument", initialpart)
self.trace("processing argument", arg)
self.trace.root.indent += 1 self.trace.root.indent += 1
try: try:
yield from self._collect(arg) yield from self._collect(initialpart)
except NoMatch: except NoMatch:
report_arg = "::".join(map(str, initialpart))
# we are inside a make_report hook so # we are inside a make_report hook so
# we cannot directly pass through the exception # we cannot directly pass through the exception
self._notfound.append((arg, sys.exc_info()[1])) self._notfound.append((report_arg, sys.exc_info()[1]))
self.trace.root.indent -= 1 self.trace.root.indent -= 1
def _collect(self, arg): def _collect(self, arg):
from _pytest.python import Package from _pytest.python import Package
names = self._parsearg(arg) names = arg[:]
argpath = names.pop(0) argpath = names.pop(0)
# Start with a Session root, and delve to argpath item (dir or file) # Start with a Session root, and delve to argpath item (dir or file)