commit: 3f2247adb5eee61c53c90a0f86adb7125f2559d8 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Mar 6 15:13:35 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> 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 <mgorny <AT> 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 }
