From 46eedbedafdb0040c37884982d4c775ce277fb7b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 20 Oct 2021 10:22:14 +0100
Subject: gentoo resync : 20.10.2021

---
 dev-python/txAMQP/Manifest            |  2 +-
 dev-python/txAMQP/txAMQP-0.8.2.ebuild | 37 ++++++++++++++++++++++++++---------
 2 files changed, 29 insertions(+), 10 deletions(-)

(limited to 'dev-python/txAMQP')

diff --git a/dev-python/txAMQP/Manifest b/dev-python/txAMQP/Manifest
index d4c9994687a9..4da7cd8cd333 100644
--- a/dev-python/txAMQP/Manifest
+++ b/dev-python/txAMQP/Manifest
@@ -1,3 +1,3 @@
 DIST txamqp-0.8.2.tar.gz 118560 BLAKE2B 6e60cc0785462b92d046a620cc09eda8b7783bd09186a60299eba11c8f6f5780fc38b094ea974e4f1e443d3d30ee1428f30ad25fdb43554d25db17f36d323527 SHA512 4a5e468482433e684dc690abddeba3e0a6c77630055afe44487de72feecad9c750d179c43dee4e781d09c9c21259cecd615dc9f6eaa7d9ff7ca0796248ad5a02
-EBUILD txAMQP-0.8.2.ebuild 1244 BLAKE2B 9e4cbed5af85442899771df4b930ff95414fd4bf78c53416a1307bc9ea180ed51d987a37ff1470416e5a71f6dffe166908d64b1da522763d0d3f0c0613faca07 SHA512 aa3a8f781990c5387b267550f60d5d48e3b33af31e462e2a6bdfe082929b47d5d91139a7866a4cc642d42ddeade1bd631acb168ed0713edaf8a339fa95e809ca
+EBUILD txAMQP-0.8.2.ebuild 1792 BLAKE2B 1fb07bdf7e9cc7e54086971cf0dffb5c465b18302d4e447f0062197507304183013432a22660c1894093aec0487baf98918bb320119f5d1906a1a380da8ba7d4 SHA512 9244021dac62da5ffe44c58ce076a8066a3048a76bfe404e7424c1ec5bc33261d587d3e76ea66c476cbfb343e8d594963dd5ee37876ec3385a1793db56c61445
 MISC metadata.xml 349 BLAKE2B 6384cbbfd96d59a37c42da7e3f36c03e154033ebc4c2f666ebf517157889059474e0597b4a75315d61be2faf0781bed46c47eadb123aa6376f01ae353ecfb4a6 SHA512 7f2976c5db1eb88248ab361b3a8c15b62fad0551d94d01fd9bbf53531d72bf467e0fe52c097a704c11917b803a38cabadca400f1b01a107384314af1636da3e5
diff --git a/dev-python/txAMQP/txAMQP-0.8.2.ebuild b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
index 31f1d27c9d08..b5cd02193b9a 100644
--- a/dev-python/txAMQP/txAMQP-0.8.2.ebuild
+++ b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
@@ -3,23 +3,25 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
 
-MY_P=${PN,,}-${PV}
+MY_P="${PN,,}-${PV}"
+
 DESCRIPTION="Python library for communicating with AMQP peers using Twisted"
 HOMEPAGE="https://github.com/txamqp/txamqp"
 # pypi tarball misses doc files
 # https://github.com/txamqp/txamqp/pull/10
 SRC_URI="https://github.com/txamqp/txamqp/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~x64-solaris"
 SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/twisted[${PYTHON_USEDEP}]
@@ -31,16 +33,12 @@ BDEPEND="
 		net-misc/rabbitmq-server
 	)"
 
-# Tests connect to the system rabbitmq server
-# TODO: figure out how to start an isolated instance
-RESTRICT="test"
-
 python_test() {
 	cd src || die
 	# tests look for those files relatively to modules
 	cp -r specs "${BUILD_DIR}"/lib || die
 
-	TXAMQP_BROKER=RABBITMQ trial txamqp
+	TXAMQP_BROKER=RABBITMQ "${EPYTHON}" -m twisted.trial txamqp
 	local ret=${?}
 
 	# avoid installing spec files
@@ -49,6 +47,27 @@ python_test() {
 	[[ ${ret} == 0 ]] || die "Tests failed with ${EPYTHON}"
 }
 
+src_test() {
+	einfo "Starting rabbitmq"
+	local -x RABBITMQ_LOG_BASE="${T}/rabbitmq/log"
+	local -x RABBITMQ_MNESIA_BASE="${T}/rabbitmq/mnesia"
+	local -x RABBITMQ_LOGS="${T}/rabbitmq.log"
+	local -x RABBITMQ_PID_FILE="${T}/rabbitmq.pid"
+	local -x RABBITMQ_ENABLED_PLUGINS_FILE="${T}/rabbitmq/enabled_plugins"
+	/usr/libexec/rabbitmq/rabbitmq-server -p 5672:5672 &
+
+	einfo "Waiting for rabbitmq to fully load"
+	while ! { echo >/dev/tcp/localhost/5672 ; } &> /dev/null; do
+		sleep 1
+	done
+	einfo "rabbitmq is ready"
+
+	distutils-r1_src_test
+
+	einfo "Stopping rabbitmq"
+	kill "$(<"${RABBITMQ_PID_FILE}")" || die
+}
+
 python_install_all() {
 	local DOCS=( doc/* )
 
-- 
cgit v1.2.3