From patchwork Mon Mar 20 13:27:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21415 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D31CC7618D for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13895.1679318875533752304 for ; Mon, 20 Mar 2023 06:27:55 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 58BB81042; Mon, 20 Mar 2023 06:28:38 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E99773F71E; Mon, 20 Mar 2023 06:27:53 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 01/17] python3-numpy: add missing dependency for the tests Date: Mon, 20 Mar 2023 13:27:35 +0000 Message-Id: <20230320132751.518693-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178813 Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-numpy_1.24.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python3-numpy_1.24.2.bb b/meta/recipes-devtools/python/python3-numpy_1.24.2.bb index 78a857bf160..bfcfc527298 100644 --- a/meta/recipes-devtools/python/python3-numpy_1.24.2.bb +++ b/meta/recipes-devtools/python/python3-numpy_1.24.2.bb @@ -66,6 +66,7 @@ RDEPENDS:${PN}-ptest += "${PYTHON_PN}-pytest \ ${PYTHON_PN}-hypothesis \ ${PYTHON_PN}-sortedcontainers \ ${PYTHON_PN}-resource \ + ${PYTHON_PN}-typing-extensions \ ldd \ " From patchwork Mon Mar 20 13:27:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21412 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC5E2C761AF for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.13800.1679318875886531243 for ; Mon, 20 Mar 2023 06:27:56 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 042BC106F; Mon, 20 Mar 2023 06:28:39 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9FBAE3F71E; Mon, 20 Mar 2023 06:27:54 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 02/17] python3: missing ptest dependencies Date: Mon, 20 Mar 2023 13:27:36 +0000 Message-Id: <20230320132751.518693-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178814 The tests need a broad set of locales and timezones to be installed. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3_3.11.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3_3.11.2.bb b/meta/recipes-devtools/python/python3_3.11.2.bb index 43c147ca6d8..98b25342283 100644 --- a/meta/recipes-devtools/python/python3_3.11.2.bb +++ b/meta/recipes-devtools/python/python3_3.11.2.bb @@ -426,8 +426,8 @@ FILES:${PN}-man = "${datadir}/man" # See https://bugs.python.org/issue18748 and https://bugs.python.org/issue37395 RDEPENDS:libpython3:append:libc-glibc = " libgcc" RDEPENDS:${PN}-ctypes:append:libc-glibc = " ${MLPREFIX}ldconfig" -RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev unzip bzip2 libgcc tzdata-europe coreutils sed" -RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-tr-tr.iso-8859-9" +RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev unzip bzip2 libgcc tzdata coreutils sed" +RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-fr-fr locale-base-en-us locale-base-tr-tr locale-base-de-de" RDEPENDS:${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${MLPREFIX}tk ${MLPREFIX}tk-lib', '', d)}" RDEPENDS:${PN}-idle += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${PN}-tkinter ${MLPREFIX}tcl', '', d)}" DEV_PKG_DEPENDENCY = "" From patchwork Mon Mar 20 13:27:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21425 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA5F8C77B73 for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.13802.1679318876207346928 for ; Mon, 20 Mar 2023 06:27:56 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A52441424; Mon, 20 Mar 2023 06:28:39 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4C4AF3F71E; Mon, 20 Mar 2023 06:27:55 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 03/17] python3: add missing -modules dependencies Date: Mon, 20 Mar 2023 13:27:37 +0000 Message-Id: <20230320132751.518693-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178815 The python3-modules package should depend on zoneinfo, and gdbm if it was enabled. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3/python3-manifest.json | 3 ++- meta/recipes-devtools/python/python3_3.11.2.bb | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json index 58e6f28a692..498402af422 100644 --- a/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/meta/recipes-devtools/python/python3/python3-manifest.json @@ -835,7 +835,8 @@ "unixadmin", "venv", "xml", - "xmlrpc" + "xmlrpc", + "zoneinfo" ], "rrecommends": [ "distutils-windows" diff --git a/meta/recipes-devtools/python/python3_3.11.2.bb b/meta/recipes-devtools/python/python3_3.11.2.bb index 98b25342283..5060722beb9 100644 --- a/meta/recipes-devtools/python/python3_3.11.2.bb +++ b/meta/recipes-devtools/python/python3_3.11.2.bb @@ -417,6 +417,7 @@ RDEPENDS:${PN}-misc += "\ " RDEPENDS:${PN}-modules:append:class-target = " ${MLPREFIX}python3-misc" RDEPENDS:${PN}-modules:append:class-nativesdk = " ${MLPREFIX}python3-misc" +RDEPENDS:${PN}-modules:append:class-target = " ${@bb.utils.contains('PACKAGECONFIG', 'gdbm', '${MLPREFIX}python3-gdbm', '', d)}" FILES:${PN}-misc = "${libdir}/python${PYTHON_MAJMIN} ${libdir}/python${PYTHON_MAJMIN}/lib-dynload" # catch manpage From patchwork Mon Mar 20 13:27:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21424 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1F78C77B71 for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.13803.1679318876748230906 for ; Mon, 20 Mar 2023 06:27:56 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5A5391042; Mon, 20 Mar 2023 06:28:40 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id ED0753F71E; Mon, 20 Mar 2023 06:27:55 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 04/17] python3-unittest-automake-output: add new recipe for ptest integration Date: Mon, 20 Mar 2023 13:27:38 +0000 Message-Id: <20230320132751.518693-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178816 This package contains modules for both unittest and pytest that alter the output to look like automake's 'make check' output, for better integration with ptest. Signed-off-by: Ross Burton --- .../python/python3-unittest-automake-output_0.1.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-unittest-automake-output_0.1.bb diff --git a/meta/recipes-devtools/python/python3-unittest-automake-output_0.1.bb b/meta/recipes-devtools/python/python3-unittest-automake-output_0.1.bb new file mode 100644 index 00000000000..5de526b895e --- /dev/null +++ b/meta/recipes-devtools/python/python3-unittest-automake-output_0.1.bb @@ -0,0 +1,12 @@ +SUMMARY = "Modules to make unittest and pytest look like Automake output, for ptest" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f6f16008d9fb7349f06609329f1ab93b" + +SRC_URI = "git://gitlab.com/rossburton/python-unittest-automake-output;protocol=https;branch=main" +SRCREV = "06537edb18f3641c70bce25256f6ecf5f5164ead" + +S = "${WORKDIR}/git" + +inherit python_flit_core + +BBCLASSEXTEND = "native nativesdk" From patchwork Mon Mar 20 13:27:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21418 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCB2DC77B6C for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.13804.1679318877416445143 for ; Mon, 20 Mar 2023 06:27:57 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 073EC106F; Mon, 20 Mar 2023 06:28:41 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A25E93F71E; Mon, 20 Mar 2023 06:27:56 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 05/17] python3-atomicwrites: use python3-unittest-automake-output Date: Mon, 20 Mar 2023 13:27:39 +0000 Message-Id: <20230320132751.518693-5-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178817 Instead of using sed to reformat the output use this new module. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-atomicwrites/run-ptest | 2 +- meta/recipes-devtools/python/python3-atomicwrites_1.4.1.bb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-atomicwrites/run-ptest b/meta/recipes-devtools/python/python3-atomicwrites/run-ptest index b63c4de0d9a..8d2017d39ce 100644 --- a/meta/recipes-devtools/python/python3-atomicwrites/run-ptest +++ b/meta/recipes-devtools/python/python3-atomicwrites/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta/recipes-devtools/python/python3-atomicwrites_1.4.1.bb b/meta/recipes-devtools/python/python3-atomicwrites_1.4.1.bb index 9f58a4bf1ff..f706f5d7be9 100644 --- a/meta/recipes-devtools/python/python3-atomicwrites_1.4.1.bb +++ b/meta/recipes-devtools/python/python3-atomicwrites_1.4.1.bb @@ -13,6 +13,7 @@ SRC_URI += " \ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ ${PYTHON_PN}-unixadmin \ " From patchwork Mon Mar 20 13:27:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21420 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D069FC77B6D for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.13807.1679318878104568377 for ; Mon, 20 Mar 2023 06:27:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A82F01042; Mon, 20 Mar 2023 06:28:41 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4F32E3F71E; Mon, 20 Mar 2023 06:27:57 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 06/17] python3-bcrypt: use python3-unittest-automake-output Date: Mon, 20 Mar 2023 13:27:40 +0000 Message-Id: <20230320132751.518693-6-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178818 Instead of using sed to reformat the output use this new module. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-bcrypt/run-ptest | 2 +- meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-bcrypt/run-ptest b/meta/recipes-devtools/python/python3-bcrypt/run-ptest index b63c4de0d9a..8d2017d39ce 100644 --- a/meta/recipes-devtools/python/python3-bcrypt/run-ptest +++ b/meta/recipes-devtools/python/python3-bcrypt/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb b/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb index 6ce45ca6ee1..9f5b81330bb 100644 --- a/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb +++ b/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb @@ -17,6 +17,7 @@ require ${BPN}-crates.inc RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ " do_install_ptest() { From patchwork Mon Mar 20 13:27:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA7A3C77B70 for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13898.1679318878712391374 for ; Mon, 20 Mar 2023 06:27:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 56442106F; Mon, 20 Mar 2023 06:28:42 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id F05063F71E; Mon, 20 Mar 2023 06:27:57 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 07/17] python3-cryptography: use python3-unittest-automake-output Date: Mon, 20 Mar 2023 13:27:41 +0000 Message-Id: <20230320132751.518693-7-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178819 Instead of using sed to reformat the output use this new module. Also show a skip message instead of nothing if the tests were skipped due to a lack of memory. Signed-off-by: Ross Burton --- .../python/python3-cryptography/check-memfree.py | 2 +- meta/recipes-devtools/python/python3-cryptography/run-ptest | 5 ++++- meta/recipes-devtools/python/python3-cryptography_39.0.2.bb | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3-cryptography/check-memfree.py b/meta/recipes-devtools/python/python3-cryptography/check-memfree.py index c111a9074c1..ed680d8d5b9 100755 --- a/meta/recipes-devtools/python/python3-cryptography/check-memfree.py +++ b/meta/recipes-devtools/python/python3-cryptography/check-memfree.py @@ -4,7 +4,7 @@ import sys meminfo = dict((i.split()[0].rstrip(':'),int(i.split()[1])) for i in open('/proc/meminfo').readlines()) mem_free = meminfo['MemTotal']/1024./1024. if mem_free < 2.: - raise RuntimeError("Insufficient free memory({:.3f}): requires > 2 GB".format(mem_free)) + print("Insufficient free memory({:.3f}): requires > 2 GB".format(mem_free)) sys.exit(1) else: print("Free memory: {:.3f} GB".format(mem_free)) diff --git a/meta/recipes-devtools/python/python3-cryptography/run-ptest b/meta/recipes-devtools/python/python3-cryptography/run-ptest index 3089df87819..041040b1cee 100644 --- a/meta/recipes-devtools/python/python3-cryptography/run-ptest +++ b/meta/recipes-devtools/python/python3-cryptography/run-ptest @@ -1,4 +1,7 @@ #!/bin/sh + if ./check-memfree.py; then - pytest -vvvv tests/ -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' + pytest tests/ --automake +else + echo "SKIP: crytography.not_enough_memory" fi diff --git a/meta/recipes-devtools/python/python3-cryptography_39.0.2.bb b/meta/recipes-devtools/python/python3-cryptography_39.0.2.bb index 4b591bc59bf..449e3ba1bcc 100644 --- a/meta/recipes-devtools/python/python3-cryptography_39.0.2.bb +++ b/meta/recipes-devtools/python/python3-cryptography_39.0.2.bb @@ -43,6 +43,7 @@ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pretend \ ${PYTHON_PN}-psutil \ ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ ${PYTHON_PN}-pytest-subtests \ ${PYTHON_PN}-pytz \ " From patchwork Mon Mar 20 13:27:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21421 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8ED3C77B62 for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13899.1679318879357084996 for ; Mon, 20 Mar 2023 06:27:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0276C1042; Mon, 20 Mar 2023 06:28:43 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9E2E93F71E; Mon, 20 Mar 2023 06:27:58 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 08/17] python3-hypothesis: use python3-unittest-automake-output Date: Mon, 20 Mar 2023 13:27:42 +0000 Message-Id: <20230320132751.518693-8-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178820 Instead of using sed to reformat the output use this new module. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-hypothesis/run-ptest | 2 +- meta/recipes-devtools/python/python3-hypothesis_6.68.2.bb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-hypothesis/run-ptest b/meta/recipes-devtools/python/python3-hypothesis/run-ptest index 8d44d7c49ac..54f6e7930f1 100644 --- a/meta/recipes-devtools/python/python3-hypothesis/run-ptest +++ b/meta/recipes-devtools/python/python3-hypothesis/run-ptest @@ -7,4 +7,4 @@ # # Instead we run two test suites imported from examples/ -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.68.2.bb b/meta/recipes-devtools/python/python3-hypothesis_6.68.2.bb index 23e842f2e28..4ffe278d78a 100644 --- a/meta/recipes-devtools/python/python3-hypothesis_6.68.2.bb +++ b/meta/recipes-devtools/python/python3-hypothesis_6.68.2.bb @@ -27,6 +27,7 @@ RDEPENDS:${PN} += " \ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ " do_install_ptest() { From patchwork Mon Mar 20 13:27:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21422 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E22EBC77B72 for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13900.1679318880054355842 for ; Mon, 20 Mar 2023 06:28:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A36B8106F; Mon, 20 Mar 2023 06:28:43 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4A83A3F71E; Mon, 20 Mar 2023 06:27:59 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 09/17] python3-jinja2: use python3-unittest-automake-output Date: Mon, 20 Mar 2023 13:27:43 +0000 Message-Id: <20230320132751.518693-9-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178821 Instead of using sed to reformat the output use this new module. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-jinja2/run-ptest | 2 +- meta/recipes-devtools/python/python3-jinja2_3.1.2.bb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/python/python3-jinja2/run-ptest b/meta/recipes-devtools/python/python3-jinja2/run-ptest index 5cec7116968..8d2017d39ce 100644 --- a/meta/recipes-devtools/python/python3-jinja2/run-ptest +++ b/meta/recipes-devtools/python/python3-jinja2/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest +pytest --automake diff --git a/meta/recipes-devtools/python/python3-jinja2_3.1.2.bb b/meta/recipes-devtools/python/python3-jinja2_3.1.2.bb index 80e0b856701..cd248cc0b4f 100644 --- a/meta/recipes-devtools/python/python3-jinja2_3.1.2.bb +++ b/meta/recipes-devtools/python/python3-jinja2_3.1.2.bb @@ -12,8 +12,7 @@ CVE_PRODUCT = "jinja2 jinja" CLEANBROKEN = "1" -inherit pypi setuptools3 -inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)} +inherit pypi setuptools3 ptest SRC_URI += " \ file://run-ptest \ @@ -25,9 +24,10 @@ do_install_ptest() { } RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-toml \ - ${PYTHON_PN}-unixadmin \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ + ${PYTHON_PN}-toml \ + ${PYTHON_PN}-unixadmin \ " RDEPENDS:${PN} += " \ From patchwork Mon Mar 20 13:27:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21419 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC9B4C77B61 for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.13808.1679318880675724053 for ; Mon, 20 Mar 2023 06:28:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4F9F01042; Mon, 20 Mar 2023 06:28:44 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id EB34E3F71E; Mon, 20 Mar 2023 06:27:59 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 10/17] python3-markupsafe: use python3-unittest-automake-output Date: Mon, 20 Mar 2023 13:27:44 +0000 Message-Id: <20230320132751.518693-10-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178822 Instead of using sed to reformat the output use this new module. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-markupsafe/run-ptest | 2 +- meta/recipes-devtools/python/python3-markupsafe_2.1.2.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3-markupsafe/run-ptest b/meta/recipes-devtools/python/python3-markupsafe/run-ptest index 5cec7116968..8d2017d39ce 100644 --- a/meta/recipes-devtools/python/python3-markupsafe/run-ptest +++ b/meta/recipes-devtools/python/python3-markupsafe/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest +pytest --automake diff --git a/meta/recipes-devtools/python/python3-markupsafe_2.1.2.bb b/meta/recipes-devtools/python/python3-markupsafe_2.1.2.bb index f4f0ad2df0f..32420529635 100644 --- a/meta/recipes-devtools/python/python3-markupsafe_2.1.2.bb +++ b/meta/recipes-devtools/python/python3-markupsafe_2.1.2.bb @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" SRC_URI[sha256sum] = "abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d" PYPI_PACKAGE = "MarkupSafe" -inherit pypi setuptools3 -inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)} +inherit pypi setuptools3 ptest RDEPENDS:${PN} += "${PYTHON_PN}-stringold" @@ -19,6 +18,7 @@ SRC_URI += " \ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ " do_install_ptest() { From patchwork Mon Mar 20 13:27:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21416 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B65CEC77B60 for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13901.1679318881337917241 for ; Mon, 20 Mar 2023 06:28:01 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F02A61424; Mon, 20 Mar 2023 06:28:44 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 97B7B3F71E; Mon, 20 Mar 2023 06:28:00 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 11/17] python3-more-itertools: use python3-unittest-automake-output Date: Mon, 20 Mar 2023 13:27:45 +0000 Message-Id: <20230320132751.518693-11-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178823 Instead of using sed to reformat the output use this new module. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-more-itertools/run-ptest | 2 +- meta/recipes-devtools/python/python3-more-itertools_9.1.0.bb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-more-itertools/run-ptest b/meta/recipes-devtools/python/python3-more-itertools/run-ptest index 3385d68939d..8d2017d39ce 100644 --- a/meta/recipes-devtools/python/python3-more-itertools/run-ptest +++ b/meta/recipes-devtools/python/python3-more-itertools/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta/recipes-devtools/python/python3-more-itertools_9.1.0.bb b/meta/recipes-devtools/python/python3-more-itertools_9.1.0.bb index 7602350795f..18a83ac0f53 100644 --- a/meta/recipes-devtools/python/python3-more-itertools_9.1.0.bb +++ b/meta/recipes-devtools/python/python3-more-itertools_9.1.0.bb @@ -17,6 +17,7 @@ RDEPENDS:${PN} += " \ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ " do_install_ptest() { From patchwork Mon Mar 20 13:27:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21417 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACB2CC7619A for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13903.1679318882069561322 for ; Mon, 20 Mar 2023 06:28:02 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9CCA21042; Mon, 20 Mar 2023 06:28:45 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 441043F71E; Mon, 20 Mar 2023 06:28:01 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 12/17] python3-pluggy: use python3-unittest-automake-output Date: Mon, 20 Mar 2023 13:27:46 +0000 Message-Id: <20230320132751.518693-12-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178824 Instead of using sed to reformat the output use this new module. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-pluggy/run-ptest | 2 +- meta/recipes-devtools/python/python3-pluggy_1.0.0.bb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-pluggy/run-ptest b/meta/recipes-devtools/python/python3-pluggy/run-ptest index b63c4de0d9a..8d2017d39ce 100644 --- a/meta/recipes-devtools/python/python3-pluggy/run-ptest +++ b/meta/recipes-devtools/python/python3-pluggy/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta/recipes-devtools/python/python3-pluggy_1.0.0.bb b/meta/recipes-devtools/python/python3-pluggy_1.0.0.bb index 2935acf95fa..99ae6336b76 100644 --- a/meta/recipes-devtools/python/python3-pluggy_1.0.0.bb +++ b/meta/recipes-devtools/python/python3-pluggy_1.0.0.bb @@ -18,6 +18,7 @@ SRC_URI += " \ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ " do_install_ptest() { From patchwork Mon Mar 20 13:27:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21423 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2E28C77B6E for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13904.1679318882721239588 for ; Mon, 20 Mar 2023 06:28:02 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 49625106F; Mon, 20 Mar 2023 06:28:46 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E4AF13F71E; Mon, 20 Mar 2023 06:28:01 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 13/17] python3-pyasn1: : use python3-unittest-automake-output Date: Mon, 20 Mar 2023 13:27:47 +0000 Message-Id: <20230320132751.518693-13-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178825 Instead of using sed to reformat the output use this new module. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python-pyasn1.inc | 1 + meta/recipes-devtools/python/python3-pyasn1/run-ptest | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python-pyasn1.inc b/meta/recipes-devtools/python/python-pyasn1.inc index 1b941630e72..126d0388efa 100644 --- a/meta/recipes-devtools/python/python-pyasn1.inc +++ b/meta/recipes-devtools/python/python-pyasn1.inc @@ -24,6 +24,7 @@ SRC_URI += " \ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ " do_install_ptest() { diff --git a/meta/recipes-devtools/python/python3-pyasn1/run-ptest b/meta/recipes-devtools/python/python3-pyasn1/run-ptest index b63c4de0d9a..8d2017d39ce 100644 --- a/meta/recipes-devtools/python/python3-pyasn1/run-ptest +++ b/meta/recipes-devtools/python/python3-pyasn1/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake From patchwork Mon Mar 20 13:27:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21414 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0444C6FD1D for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.13810.1679318883337249320 for ; Mon, 20 Mar 2023 06:28:03 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EA0F31042; Mon, 20 Mar 2023 06:28:46 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9146F3F71E; Mon, 20 Mar 2023 06:28:02 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 14/17] python3-pytz: use python3-unittest-automake-output Date: Mon, 20 Mar 2023 13:27:48 +0000 Message-Id: <20230320132751.518693-14-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178826 Instead of using sed to reformat the output use this new module. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-pytz/run-ptest | 2 +- meta/recipes-devtools/python/python3-pytz_2022.7.1.bb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-pytz/run-ptest b/meta/recipes-devtools/python/python3-pytz/run-ptest index b63c4de0d9a..8d2017d39ce 100644 --- a/meta/recipes-devtools/python/python3-pytz/run-ptest +++ b/meta/recipes-devtools/python/python3-pytz/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta/recipes-devtools/python/python3-pytz_2022.7.1.bb b/meta/recipes-devtools/python/python3-pytz_2022.7.1.bb index 553b9cfa181..e399f2139a7 100644 --- a/meta/recipes-devtools/python/python3-pytz_2022.7.1.bb +++ b/meta/recipes-devtools/python/python3-pytz_2022.7.1.bb @@ -24,6 +24,7 @@ SRC_URI += " \ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ " do_install_ptest() { From patchwork Mon Mar 20 13:27:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21413 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EB5BC76195 for ; Mon, 20 Mar 2023 13:28:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13905.1679318884006133719 for ; Mon, 20 Mar 2023 06:28:04 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9675D106F; Mon, 20 Mar 2023 06:28:47 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3DDDD3F71E; Mon, 20 Mar 2023 06:28:03 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 15/17] python3-wcwidth: use python3-unittest-automake-output Date: Mon, 20 Mar 2023 13:27:49 +0000 Message-Id: <20230320132751.518693-15-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178827 Instead of using sed to reformat the output use this new module. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-wcwidth/run-ptest | 2 +- meta/recipes-devtools/python/python3-wcwidth_0.2.6.bb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3-wcwidth/run-ptest b/meta/recipes-devtools/python/python3-wcwidth/run-ptest index b63c4de0d9a..8d2017d39ce 100644 --- a/meta/recipes-devtools/python/python3-wcwidth/run-ptest +++ b/meta/recipes-devtools/python/python3-wcwidth/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta/recipes-devtools/python/python3-wcwidth_0.2.6.bb b/meta/recipes-devtools/python/python3-wcwidth_0.2.6.bb index 368146dba48..fbd008c13de 100644 --- a/meta/recipes-devtools/python/python3-wcwidth_0.2.6.bb +++ b/meta/recipes-devtools/python/python3-wcwidth_0.2.6.bb @@ -14,11 +14,12 @@ SRC_URI += " \ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ " do_install_ptest() { install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ } BBCLASSEXTEND = "native nativesdk" From patchwork Mon Mar 20 13:27:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21426 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11D84C7618A for ; Mon, 20 Mar 2023 13:28:05 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13907.1679318884655876704 for ; Mon, 20 Mar 2023 06:28:04 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 42B561042; Mon, 20 Mar 2023 06:28:48 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DE7543F71E; Mon, 20 Mar 2023 06:28:03 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 16/17] python3-webcolors: use python3-unittest-automake-output Date: Mon, 20 Mar 2023 13:27:50 +0000 Message-Id: <20230320132751.518693-16-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178828 Instead of using sed to reformat the output use this new module. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-webcolors/run-ptest | 2 +- meta/recipes-devtools/python/python3-webcolors_1.12.bb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-webcolors/run-ptest b/meta/recipes-devtools/python/python3-webcolors/run-ptest index 3385d68939d..8d2017d39ce 100644 --- a/meta/recipes-devtools/python/python3-webcolors/run-ptest +++ b/meta/recipes-devtools/python/python3-webcolors/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta/recipes-devtools/python/python3-webcolors_1.12.bb b/meta/recipes-devtools/python/python3-webcolors_1.12.bb index 39ff19c2b8a..02f6c9fed89 100644 --- a/meta/recipes-devtools/python/python3-webcolors_1.12.bb +++ b/meta/recipes-devtools/python/python3-webcolors_1.12.bb @@ -17,6 +17,7 @@ SRC_URI += " \ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ " do_install_ptest() { From patchwork Mon Mar 20 13:27:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21428 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6FBEC6FD1D for ; Mon, 20 Mar 2023 13:28:14 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13909.1679318885317032966 for ; Mon, 20 Mar 2023 06:28:05 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E35D1106F; Mon, 20 Mar 2023 06:28:48 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8AD4A3F71E; Mon, 20 Mar 2023 06:28:04 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 17/17] python3-jsonpointer: rewrite testing Date: Mon, 20 Mar 2023 13:27:51 +0000 Message-Id: <20230320132751.518693-17-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320132751.518693-1-ross.burton@arm.com> References: <20230320132751.518693-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Mar 2023 13:28:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178829 The tests installed by jsonpointer use unittest not pytest, so update the dependencies. Use the unittest runner in python3-unittest-automake-output to get the correct output. Apply a patch so the test suite doesn't run twice. Signed-off-by: Ross Burton --- .../0001-Clean-up-test-runner.patch | 62 +++++++++++++++++++ .../python/python3-jsonpointer/run-ptest | 2 +- .../python/python3-jsonpointer_2.3.bb | 6 +- 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch diff --git a/meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch b/meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch new file mode 100644 index 00000000000..4121834dbfb --- /dev/null +++ b/meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch @@ -0,0 +1,62 @@ +From 04a864f33848da6af1dea906ba4922770022ef66 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Thu, 16 Mar 2023 14:21:32 +0000 +Subject: [PATCH] Clean up test runner + +Test code doesn't need to manually construct a TestSuite and a +TextTestRunner, the unittest module has a discovery function that does +all this for you. + +Delete all of the manual logic from tests.py, replace it with the two +lines to bring in the doctest unit tests, and update the makefile to +run the unittest discovery. + +Upstream-Status: Submitted [https://github.com/stefankoegl/python-json-pointer/pull/54] +Signed-off-by: Ross Burton +--- + makefile | 2 +- + tests.py | 24 ++++-------------------- + 2 files changed, 5 insertions(+), 21 deletions(-) + +diff --git a/tests.py b/tests.py +index 9252369..6b4b8cc 100755 +--- a/tests.py ++++ b/tests.py +@@ -7,6 +7,7 @@ import doctest + import unittest + import sys + import copy ++import jsonpointer + from jsonpointer import resolve_pointer, EndOfList, JsonPointerException, \ + JsonPointer, set_pointer + +@@ -410,23 +411,6 @@ class AltTypesTests(unittest.TestCase): + self.assertRaises(JsonPointerException, resolve_pointer, doc, '/root/1/2/3/4') + + +- +-suite = unittest.TestSuite() +-suite.addTest(unittest.makeSuite(SpecificationTests)) +-suite.addTest(unittest.makeSuite(ComparisonTests)) +-suite.addTest(unittest.makeSuite(WrongInputTests)) +-suite.addTest(unittest.makeSuite(ToLastTests)) +-suite.addTest(unittest.makeSuite(SetTests)) +-suite.addTest(unittest.makeSuite(AltTypesTests)) +- +-modules = ['jsonpointer'] +- +-for module in modules: +- m = __import__(module, fromlist=[module]) +- suite.addTest(doctest.DocTestSuite(m)) +- +-runner = unittest.TextTestRunner(verbosity=1) +-result = runner.run(suite) +- +-if not result.wasSuccessful(): +- sys.exit(1) ++def load_tests(loader, tests, ignore): ++ tests.addTests(doctest.DocTestSuite(jsonpointer)) ++ return tests +-- +2.34.1 + diff --git a/meta/recipes-devtools/python/python3-jsonpointer/run-ptest b/meta/recipes-devtools/python/python3-jsonpointer/run-ptest index 51e609f4bad..7ebd69231f2 100644 --- a/meta/recipes-devtools/python/python3-jsonpointer/run-ptest +++ b/meta/recipes-devtools/python/python3-jsonpointer/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -python3 tests.py +python3 -mputao.unittest tests.py diff --git a/meta/recipes-devtools/python/python3-jsonpointer_2.3.bb b/meta/recipes-devtools/python/python3-jsonpointer_2.3.bb index 16d5cab4cfb..0ec4de055c5 100644 --- a/meta/recipes-devtools/python/python3-jsonpointer_2.3.bb +++ b/meta/recipes-devtools/python/python3-jsonpointer_2.3.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=32b15c843b7a329130f4e266a281ebb3" inherit pypi ptest setuptools3 +SRC_URI += "file://0001-Clean-up-test-runner.patch" + SRC_URI[sha256sum] = "97cba51526c829282218feb99dab1b1e6bdf8efd1c43dc9d57be093c0d69c99a" RDEPENDS:${PN} += " \ @@ -18,7 +20,9 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-doctest \ + ${PYTHON_PN}-unittest \ + ${PYTHON_PN}-unittest-automake-output \ " do_install_ptest() {