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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 12DBD15802F for ; Mon, 6 Mar 2023 15:22:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A2B1E08AD; Mon, 6 Mar 2023 15:22:41 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 375C6E08AD for ; Mon, 6 Mar 2023 15:22:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C32F3413B0 for ; Mon, 6 Mar 2023 15:22:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8E15893 for ; Mon, 6 Mar 2023 15:22:37 +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: <1678116148.3f2247adb5eee61c53c90a0f86adb7125f2559d8.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/python-memcached/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/python-memcached/python-memcached-1.59-r1.ebuild X-VCS-Directories: dev-python/python-memcached/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3f2247adb5eee61c53c90a0f86adb7125f2559d8 X-VCS-Branch: master Date: Mon, 6 Mar 2023 15:22:37 +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: da629a70-7851-4092-9406-1ca1b2ecdcfb X-Archives-Hash: 3722517b824a40a45e60e98f2710daf5 commit: 3f2247adb5eee61c53c90a0f86adb7125f2559d8 Author: Michał Górny gentoo org> AuthorDate: Mon Mar 6 15:13:35 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Mar 6 15:22:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f2247ad dev-python/python-memcached: Use unittest instead of nose Closes: https://bugs.gentoo.org/888261 Signed-off-by: Michał Górny gentoo.org> .../python-memcached/python-memcached-1.59-r1.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-python/python-memcached/python-memcached-1.59-r1.ebuild b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild index b925997aac3d..8a90d01b36a7 100644 --- a/dev-python/python-memcached/python-memcached-1.59-r1.ebuild +++ b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild @@ -27,23 +27,23 @@ BDEPEND=" ) " -distutils_enable_tests nose +distutils_enable_tests unittest python_test() { local pidfile="${TMPDIR}/memcached.pid" - memcached -d -P "$pidfile" || die "failed to start memcached" + memcached -d -P "${pidfile}" || die "failed to start memcached" - nosetests -v || die "Tests fail with ${EPYTHON}" + eunittest || die "Tests fail with ${EPYTHON}" - kill "$(<"$pidfile")" || die "failed to kill memcached" + kill "$(<"${pidfile}")" || die "failed to kill memcached" local elapsed=0 - while [[ -f "$pidfile" ]]; do - if [[ $elapsed -ge 30 ]]; then - kill -KILL "$(<"$pidfile")" || die "failed to kill -KILL memcached" + while [[ -f ${pidfile} ]]; do + if [[ $(( elapsed++ )) -ge 30 ]]; then + kill -KILL "$(<"${pidfile}")" || + die "failed to kill -KILL memcached" die "memcached failed to stop after 30 seconds" fi sleep 1 - let elapsed++ done }