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

Merge pull request #3798 from jonozzz/fix-3751 

Fix #3751
This commit is contained in:
Ronny Pfannschmidt 2018-08-16 06:52:16 +02:00 committed by GitHub
parent 64faa41d06 27b5435a40
commit 939a792c41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/_pytest/main.py
View File

@ -505,8 +505,9 @@ class Session(nodes.FSCollector):
root = self._node_cache[pkginit] root = self._node_cache[pkginit]
else: else:
col = root._collectfile(pkginit) col = root._collectfile(pkginit)
if col and isinstance(col, Package): if col:
root = col[0] if isinstance(col[0], Package):
root = col[0]
self._node_cache[root.fspath] = root self._node_cache[root.fspath] = root
# If it's a directory argument, recurse and look for any Subpackages. # If it's a directory argument, recurse and look for any Subpackages.

11
testing/test_collection.py
View File

@ -638,6 +638,10 @@ class Test_getinitialnodes(object):
assert col.config is config assert col.config is config
def test_pkgfile(self, testdir): def test_pkgfile(self, testdir):
"""Verify nesting when a module is within a package.
The parent chain should match: Module<x.py> -> Package<subdir> -> Session.
Session's parent should always be None.
"""
tmpdir = testdir.tmpdir tmpdir = testdir.tmpdir
subdir = tmpdir.join("subdir") subdir = tmpdir.join("subdir")
x = subdir.ensure("x.py") x = subdir.ensure("x.py")
@ -645,9 +649,12 @@ class Test_getinitialnodes(object):
with subdir.as_cwd(): with subdir.as_cwd():
config = testdir.parseconfigure(x) config = testdir.parseconfigure(x)
col = testdir.getnode(config, x) col = testdir.getnode(config, x)
assert isinstance(col, pytest.Module)
assert col.name == "x.py" assert col.name == "x.py"
assert col.parent.parent is None assert isinstance(col, pytest.Module)
assert isinstance(col.parent, pytest.Package)
assert isinstance(col.parent.parent, pytest.Session)
# session is batman (has no parents)
assert col.parent.parent.parent is None
for col in col.listchain(): for col in col.listchain():
assert col.config is config assert col.config is config