From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 02ACE1382C5 for ; Sun, 28 Mar 2021 11:48:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 389D7E092F; Sun, 28 Mar 2021 11:48:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F991E092F for ; Sun, 28 Mar 2021 11:48:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C0C4340D80 for ; Sun, 28 Mar 2021 11:48:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3827C3 for ; Sun, 28 Mar 2021 11:48:47 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1616932121.e7474dec0dcc7c6dd20f4e0feaeda380f4bacd47.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/tests/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/tests/distutils-r1.sh eclass/tests/distutils-r1_single.sh X-VCS-Directories: eclass/tests/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e7474dec0dcc7c6dd20f4e0feaeda380f4bacd47 X-VCS-Branch: master Date: Sun, 28 Mar 2021 11:48:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9dddc5d5-3577-40d4-a74a-45e915803de0 X-Archives-Hash: 2ee36553cf9ba991bee229499b913a97 commit: e7474dec0dcc7c6dd20f4e0feaeda380f4bacd47 Author: Michał Górny gentoo org> AuthorDate: Sun Mar 28 11:48:13 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Mar 28 11:48:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7474dec eclass/tests: Update distutils-r1 expected values Signed-off-by: Michał Górny gentoo.org> eclass/tests/distutils-r1.sh | 4 ++-- eclass/tests/distutils-r1_single.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/tests/distutils-r1.sh b/eclass/tests/distutils-r1.sh index 93496f9ac00..163a509b306 100755 --- a/eclass/tests/distutils-r1.sh +++ b/eclass/tests/distutils-r1.sh @@ -108,7 +108,7 @@ test-distutils_enable_tests pytest \ test-distutils_enable_tests nose \ "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( >=dev-python/nose-1.3.7-r4[${PYTHON_USEDEP}] )" test-distutils_enable_tests unittest \ - "${BASE_IUSE}" "" "${BASE_DEPS}" + "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( dev-python/unittest-or-fail[${PYTHON_USEDEP}] )" test-distutils_enable_tests setup.py \ "${BASE_IUSE}" "" "${BASE_DEPS}" eoutdent @@ -122,7 +122,7 @@ test-distutils_enable_tests pytest \ test-distutils_enable_tests nose \ "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} >=dev-python/nose-1.3.7-r4[${PYTHON_USEDEP}] )" test-distutils_enable_tests unittest \ - "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} )" + "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} dev-python/unittest-or-fail[${PYTHON_USEDEP}] )" test-distutils_enable_tests setup.py \ "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} )" eoutdent diff --git a/eclass/tests/distutils-r1_single.sh b/eclass/tests/distutils-r1_single.sh index 80c152b6ee0..fb177261d0a 100755 --- a/eclass/tests/distutils-r1_single.sh +++ b/eclass/tests/distutils-r1_single.sh @@ -88,7 +88,7 @@ test-distutils_enable_tests pytest \ test-distutils_enable_tests nose \ "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( python_single_target_python3_8? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)] ) )" test-distutils_enable_tests unittest \ - "${BASE_IUSE}" "" "${BASE_DEPS}" + "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( python_single_target_python3_8? ( dev-python/unittest-or-fail[python_targets_python3_8(-)] ) )" test-distutils_enable_tests setup.py \ "${BASE_IUSE}" "" "${BASE_DEPS}" eoutdent @@ -102,7 +102,7 @@ test-distutils_enable_tests pytest \ test-distutils_enable_tests nose \ "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} python_single_target_python3_8? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)] ) )" test-distutils_enable_tests unittest \ - "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} )" + "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} python_single_target_python3_8? ( dev-python/unittest-or-fail[python_targets_python3_8(-)] ) )" test-distutils_enable_tests setup.py \ "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} )" eoutdent