From owner-dev-commits-ports-main@freebsd.org Tue Jul 20 09:18:12 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BA794668D62; Tue, 20 Jul 2021 09:18:12 +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 4GTY6D4H93z4mSq; Tue, 20 Jul 2021 09:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 771DE27DD6; Tue, 20 Jul 2021 09:18:12 +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 16K9ICxX094482; Tue, 20 Jul 2021 09:18:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16K9ICL8094481; Tue, 20 Jul 2021 09:18:12 GMT (envelope-from git) Date: Tue, 20 Jul 2021 09:18:12 GMT Message-Id: <202107200918.16K9ICL8094481@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Gmelin Subject: git: 12d8f46d9b98 - main - sysutils/iocage: Add test target, no pytest-runner MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grembo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12d8f46d9b985f987ede218e15a5789ff0ace5df Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jul 2021 09:18:12 -0000 The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=12d8f46d9b985f987ede218e15a5789ff0ace5df commit 12d8f46d9b985f987ede218e15a5789ff0ace5df Author: Michael Gmelin AuthorDate: 2021-07-20 09:13:14 +0000 Commit: Michael Gmelin CommitDate: 2021-07-20 09:13:14 +0000 sysutils/iocage: Add test target, no pytest-runner Move test dependencies to TEST_DEPENDS and add test target. Patch out pytest-runner locally. PR: 251447 Reported by: koobs --- sysutils/iocage/Makefile | 8 +++++++- sysutils/iocage/files/patch-setup.py | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile index af3a47925b83..e1dba6cb42d6 100644 --- a/sysutils/iocage/Makefile +++ b/sysutils/iocage/Makefile @@ -15,7 +15,10 @@ COMMENT= FreeBSD jail manager written in Python3 LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-pep8>0:devel/py-pytest-pep8@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>=4.10.0:misc/py-tqdm@${PY_FLAVOR} \ @@ -54,4 +57,7 @@ GIT_LITE_DESC= depend on lite flavor of devel/git (bare minimum git experience) GIT_RUN_DEPENDS=git:devel/git GIT_LITE_RUN_DEPENDS=git:devel/git@lite +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest + .include diff --git a/sysutils/iocage/files/patch-setup.py b/sysutils/iocage/files/patch-setup.py new file mode 100644 index 000000000000..050d3da7ee13 --- /dev/null +++ b/sysutils/iocage/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py.orig 2019-09-26 07:23:24 UTC ++++ setup.py +@@ -58,7 +58,7 @@ setup( + 'dnspython>=1.15.0', + 'libzfs' + ], +- setup_requires=['pytest-runner'], ++# setup_requires=['pytest-runner'], + entry_points={'console_scripts': ['iocage = iocage_lib:cli']}, + data_files=_data, + tests_require=['pytest', 'pytest-cov', 'pytest-pep8']