p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cacheprovider: fix typing with Path(py.path.local) (#6774) 

Fixes:

> Argument 1 to "Path" has incompatible type "Union[local, Any]";
> expected "Union[str, _PathLike[str]]"  [arg-type]

Ref: https://github.com/pytest-dev/py/pull/232#pullrequestreview-349549522
This commit is contained in:
Daniel Hahler 2020-02-20 13:23:41 +01:00 committed by GitHub
parent 8a1633c3b4
commit 4d633a29be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/_pytest/cacheprovider.py
View File

@ -181,13 +181,13 @@ class LFPluginCollWrapper:
# Sort any lf-paths to the beginning. # Sort any lf-paths to the beginning.
lf_paths = self.lfplugin._last_failed_paths lf_paths = self.lfplugin._last_failed_paths
res.result = sorted( res.result = sorted(
res.result, key=lambda x: 0 if Path(x.fspath) in lf_paths else 1, res.result, key=lambda x: 0 if Path(str(x.fspath)) in lf_paths else 1,
) )
out.force_result(res) out.force_result(res)
return return
elif isinstance(collector, Module): elif isinstance(collector, Module):
if Path(collector.fspath) in self.lfplugin._last_failed_paths: if Path(str(collector.fspath)) in self.lfplugin._last_failed_paths:
out = yield out = yield
res = out.get_result() res = out.get_result()
@ -214,7 +214,7 @@ class LFPluginCollSkipfiles:
@pytest.hookimpl @pytest.hookimpl
def pytest_make_collect_report(self, collector) -> Optional[CollectReport]: def pytest_make_collect_report(self, collector) -> Optional[CollectReport]:
if isinstance(collector, Module): if isinstance(collector, Module):
if Path(collector.fspath) not in self.lfplugin._last_failed_paths: if Path(str(collector.fspath)) not in self.lfplugin._last_failed_paths:
self.lfplugin._skipped_files += 1 self.lfplugin._skipped_files += 1
return CollectReport( return CollectReport(
@ -246,7 +246,7 @@ class LFPlugin:
def get_last_failed_paths(self) -> Set[Path]: def get_last_failed_paths(self) -> Set[Path]:
"""Returns a set with all Paths()s of the previously failed nodeids.""" """Returns a set with all Paths()s of the previously failed nodeids."""
rootpath = Path(self.config.rootdir) rootpath = Path(str(self.config.rootdir))
result = {rootpath / nodeid.split("::")[0] for nodeid in self.lastfailed} result = {rootpath / nodeid.split("::")[0] for nodeid in self.lastfailed}
return {x for x in result if x.exists()} return {x for x in result if x.exists()}