mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-06 16:40:47 +00:00
atf_pytest_wrapper: fix use with pytest-7.4
As of pytest 7.4 it no longer walks all the way to the root directory
of the file system to find conftest files. As a result we don't find /
usr/tests/conftest.py, and don't load atf_python. That in turn causes
atf_python tests to fail.
Explicitly set the confcutdir, as advised by the pytest changelog.
See also: https://github.com/pytest-dev/pytest/pull/11043
MFC after: 3 weeks
Sponsored by: Orange Business Services
Differential Revision: https://reviews.freebsd.org/D41064
(cherry picked from commit 9f23cbd6ca
)
This commit is contained in:
parent
b26e36c34e
commit
06185987d3
|
@ -141,6 +141,8 @@ class Handler {
|
|||
std::vector<std::string> args = {"pytest", "-vv", "-p",
|
||||
"no:cacheprovider", "-s", "--atf"};
|
||||
|
||||
args.push_back("--confcutdir=" + python_path);
|
||||
|
||||
if (flag_list) {
|
||||
args.push_back("--co");
|
||||
args.push_back(script_path);
|
||||
|
|
Loading…
Reference in a new issue