From nobody Fri Aug 04 14:08:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RHSHC5cygz4kWL8; Fri, 4 Aug 2023 14:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHSHC4zZ0z3Gxq; Fri, 4 Aug 2023 14:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691158103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4h0BhqdiSVhiJXY4x3gTVt9jtGzlb0TGBOQKtX65hRQ=; b=F7hUrus5JuClR2kNGS02KTpKTMaFBiD3e8inQvi+Ox6dtJ+nwvSUJyftAnCILdVoNjL5R5 MWsR5/4XIx07KBcRCYPGomm2zqKoteFjfP9UG9ZGuisjEkk9Mh6HuPw/Wn5PyesZ8tFL98 ICAygKlUCx9H/duux4n1vsOQODpOd/cKbTz2Gd8rrDgtGySHxw1i2cs1ZBLEVX9CawWZs5 nuuxYYXrQEZoPShnrUcjx+GsraSEglp4gHTPmuW84v2HKGhRnoEG+aapThSGMVNajZ7YiV htzuWkyaP5Yev98mfBt42rtUSBC3GnvzlcJMydEjmDLzo1kiPxmnsMz7kCLk2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691158103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4h0BhqdiSVhiJXY4x3gTVt9jtGzlb0TGBOQKtX65hRQ=; b=VNERSPiLSPEpWxBQUH+WkzWBhYhz7evVo4iTBh6xAOTWCDZMJY6eYRqay46L4BXzl57bV3 y5mtOryV+WhruOD8B6sL5qlgGU6l5LPeYRVtiIXgZ1DgeqeGR3d0k+v0C8PXjPPRLlKZOi WsAYdjrM/8OO+vqDsGuQAbJODUJjrW43YiCjSPNlVAS006VLtuo4jYRAOh23ZfyGcW9k9r WcxpubMkzZ4AEWmWtDRuu9vnFfG87Fl/8MPRlkJT8fCf0W4EKUNIz1zmL4uGSlAyFY3Gld mGsDOPXAaCGrdT3JlYEMu2TUK0zz/Nob+D2+WkRsokOfO5CSRgk1s2FwQoeVBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691158103; a=rsa-sha256; cv=none; b=V945WUI8bJCnhaJRm2+PkY0q369Bl/+X1cgCGsi7gxQNjZDg9BBEQvxaJ9McdHaDlTsL9M 8AZqfNzjxS8sB7s46C0ZEk/OGHb0pY/8bkFkIg8BWKlB/+MWmLQ3dL+fmuH8ATPb98rPju jGa2awKoiSuDct9Q0CzR5XYRNkh5iJ/As3mwPTOroz558PQcYzWuiD0Yl3i0tuZnE3g4eH yqzDSs4N9bQQXwvf7dO0HbeIO4PZqgrKupSlZrrPycKzQyCfnyh66bI3xxVCxXGO+Cansb bgwbpf9GiBIq8ruD6WMZH26ho5g1NmhAkGfxlUaVuRrrprJqlQQUIYh2dmI6QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHSHC43tGz15DX; Fri, 4 Aug 2023 14:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 374E8NiS087504; Fri, 4 Aug 2023 14:08:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374E8NeP087503; Fri, 4 Aug 2023 14:08:23 GMT (envelope-from git) Date: Fri, 4 Aug 2023 14:08:23 GMT Message-Id: <202308041408.374E8NeP087503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 06185987d36f - stable/13 - atf_pytest_wrapper: fix use with pytest-7.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 06185987d36ffdeff4e34608bb910fe629c76da5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=06185987d36ffdeff4e34608bb910fe629c76da5 commit 06185987d36ffdeff4e34608bb910fe629c76da5 Author: Kristof Provost AuthorDate: 2023-07-18 14:20:47 +0000 Commit: Kristof Provost CommitDate: 2023-08-04 14:08:05 +0000 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 9f23cbd6cae82fd77edfad7173432fa8dccd0a95) --- libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp b/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp index 78b045b9775f..b0cc600bde21 100644 --- a/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp +++ b/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp @@ -141,6 +141,8 @@ class Handler { std::vector 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);