From nobody Fri Jan 13 21:25:28 2023 X-Original-To: dev-commits-src-branches@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 4NtvbD4QgQz2ql5Q; Fri, 13 Jan 2023 21:25:28 +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 4NtvbD3KfPz42SV; Fri, 13 Jan 2023 21:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645128; 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=JpHFVwIYoLXW0E8x/Fzyu8hZ+Rwh27/ttJ3tugud9NM=; b=UP//DGVgNd7gKAPnJlrFAdhR3o3Dv2hu7bAmkuCEah36Exp0VSYYUaQjVqUCSZwKHPFN3m 58FvzHvei6zKxzYm8tNjywvWQ79trsgaRwqpKPb/g7rNjjhS1P91HijPxWA9hIkLUUJGB5 wjVc2iY+QkFp4I4RHFSv1SxMpJ+7BdC6l6VYnDQLd0dDUTAEwIADkd34H0H14nlpkeCHjU T9gwxVonxvLAxUUkJPKOevzmWg6eNzITamrpIjzylvaCT31mzjreOEUOBqIqwUDRBW1i1c /O/Og8BMNVt6KYdwJXaAXz39mFl3QDHBkLnQSxfujcYJzFmr0+QllZR0ksEzCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645128; 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=JpHFVwIYoLXW0E8x/Fzyu8hZ+Rwh27/ttJ3tugud9NM=; b=xNXF1XIDr2FeQU9iZMCJ52sBx1JuF+/TVIVY6ZJJMmDJ4sNO1gjCHonaMWF8n+tamTLQLp orFKwbIWVjLTnze/XcyL0iYi3+MJFqGIPd6lU7TA6kPSwoEWBARz6hoxwZoFJA6JFcypeR LmkkgDZmcpm+3BiUkN1ckxN5pjmy1iTEE2PAwJ8LfuT88FFZg532hrx3lXt/rF859AEl8d 2uYaDuLJS7mUHo1CMTWZudyhkNtc0ese1BaipasqCBxpzsHwQdhSNmARYFps3RIxPSTEvF OpM0o1nDf9Yl5gTMHqxfcQ/dtcocgrlNs70/6YMk1rIi6oyPEU3oRSl8kSnfQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673645128; a=rsa-sha256; cv=none; b=rYPU0zG1odmhPfSpRY4wAgdFtQDkKz0kk1m/T+m/99sIiJccxMBRqHQCVCBhpPl1CzFp3S +XJwdDvAkUa/t6/QsZViUGKXBFjDPGxPmSnl8HLqsgeaFgBhSemUlYCX6irhsbBvnFgZxP ex+mvcELC8CtodrPjEhJ29zNtHS2lVKGV8+iv0bjQm53pkBPIH456XM77MnnUKdzwzH/zM 0kiGVprXBqpCW0eJdx7qdG/RBALTMJqTzb4YbtqN+rOnNHiEct3NaEVNhq1oHS7SALkh3X IrQlcr63tSL3lLIS983h+YU05qP3cXieYLME3IX0RbyPQ5s60nUvHe3LHjNL8Q== 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 4NtvbD2QJKzMrY; Fri, 13 Jan 2023 21:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30DLPSpu041893; Fri, 13 Jan 2023 21:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DLPSZa041892; Fri, 13 Jan 2023 21:25:28 GMT (envelope-from git) Date: Fri, 13 Jan 2023 21:25:28 GMT Message-Id: <202301132125.30DLPSZa041892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 1c97b8e2eb06 - stable/13 - testing: workaround pytest parser bug in pytest-atf-wrapper. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1c97b8e2eb06f643dd6393d7aee90ef4b7f07a47 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=1c97b8e2eb06f643dd6393d7aee90ef4b7f07a47 commit 1c97b8e2eb06f643dd6393d7aee90ef4b7f07a47 Author: Alexander V. Chernikov AuthorDate: 2022-06-27 15:52:25 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-13 21:24:10 +0000 testing: workaround pytest parser bug in pytest-atf-wrapper. Reviewed by: lwhsu, kp Differential Revision: https://reviews.freebsd.org/D35614 MFC after: 2 weeks (cherry picked from commit 9c42645a1e4d6695730187aef0f1494394503624) --- libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp b/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp index 11fd3c47d507..bc7eec3b851d 100644 --- a/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp +++ b/libexec/atf/atf-pytest-wrapper/atf_pytest_wrapper.cpp @@ -137,13 +137,15 @@ class Handler { if (flag_cleanup) { args.push_back("--atf-cleanup"); } + // workaround pytest parser bug: + // https://github.com/pytest-dev/pytest/issues/3097 + // use '--arg=value' format instead of '--arg value' for all + // path-like options if (!src_dir.empty()) { - args.push_back("--atf-source-dir"); - args.push_back(src_dir); + args.push_back("--atf-source-dir=" + src_dir); } if (!dst_file.empty()) { - args.push_back("--atf-file"); - args.push_back(dst_file); + args.push_back("--atf-file=" + dst_file); } for (auto &pair: kv_list) { args.push_back("--atf-var");