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

Merge pull request #7668 from bluetech/dir-match-msg 

main: improve message on `pytest path/to/a/directory::mytest`
This commit is contained in:
Ran Benita 2020-08-23 12:05:22 +03:00 committed by GitHub
parent 75af2bfa06 5e39cd5e71
commit 837687c21a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/_pytest/main.py
View File

@ -808,6 +808,7 @@ def resolve_collection_argument(
found module. found module.
If the path doesn't exist, raise UsageError. If the path doesn't exist, raise UsageError.
If the path is a directory and selection parts are present, raise UsageError.
""" """
strpath, *parts = str(arg).split("::") strpath, *parts = str(arg).split("::")
if as_pypath: if as_pypath:
@ -821,4 +822,11 @@ def resolve_collection_argument(
else "file or directory not found: {arg}" else "file or directory not found: {arg}"
) )
raise UsageError(msg.format(arg=arg)) raise UsageError(msg.format(arg=arg))
if parts and fspath.is_dir():
msg = (
"package argument cannot contain :: selection parts: {arg}"
if as_pypath
else "directory argument cannot contain :: selection parts: {arg}"
)
raise UsageError(msg.format(arg=arg))
return py.path.local(str(fspath)), parts return py.path.local(str(fspath)), parts

35
testing/test_main.py
View File

@ -136,23 +136,21 @@ class TestResolveCollectionArgument:
["foo", "bar", ""], ["foo", "bar", ""],
) )
def test_dir(self, root): def test_dir(self, root: py.path.local) -> None:
"""Directory and parts.""" """Directory and parts."""
assert resolve_collection_argument(root, "src/pkg") == (root / "src/pkg", []) assert resolve_collection_argument(root, "src/pkg") == (root / "src/pkg", [])
assert resolve_collection_argument(root, "src/pkg::") == (
root / "src/pkg",
[""],
)
assert resolve_collection_argument(root, "src/pkg::foo::bar") == (
root / "src/pkg",
["foo", "bar"],
)
assert resolve_collection_argument(root, "src/pkg::foo::bar::") == (
root / "src/pkg",
["foo", "bar", ""],
)
def test_pypath(self, root): with pytest.raises(
UsageError, match=r"directory argument cannot contain :: selection parts"
):
resolve_collection_argument(root, "src/pkg::")
with pytest.raises(
UsageError, match=r"directory argument cannot contain :: selection parts"
):
resolve_collection_argument(root, "src/pkg::foo::bar")
def test_pypath(self, root: py.path.local) -> None:
"""Dotted name and parts.""" """Dotted name and parts."""
assert resolve_collection_argument(root, "pkg.test", as_pypath=True) == ( assert resolve_collection_argument(root, "pkg.test", as_pypath=True) == (
root / "src/pkg/test.py", root / "src/pkg/test.py",
@ -165,10 +163,11 @@ class TestResolveCollectionArgument:
root / "src/pkg", root / "src/pkg",
[], [],
) )
assert resolve_collection_argument(root, "pkg::foo::bar", as_pypath=True) == (
root / "src/pkg", with pytest.raises(
["foo", "bar"], UsageError, match=r"package argument cannot contain :: selection parts"
) ):
resolve_collection_argument(root, "pkg::foo::bar", as_pypath=True)
def test_does_not_exist(self, root): def test_does_not_exist(self, root):
"""Given a file/module that does not exist raises UsageError.""" """Given a file/module that does not exist raises UsageError."""