From d479c9c5c724c7b1300a98e44975f31f4f2e51dd Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 6 Dec 2022 21:11:24 +0000
Subject: gentoo auto-resync : 06:12:2022 - 21:11:24

---
 dev-python/redis-py/Manifest              |  2 +-
 dev-python/redis-py/redis-py-4.4.0.ebuild | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'dev-python/redis-py')

diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 86a4b8a1d453..a0aaa32a257d 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -3,5 +3,5 @@ DIST redis-py-4.3.5.gh.tar.gz 4620696 BLAKE2B 2eaa40fc0ad624c4b8444054dcfea70ba1
 DIST redis-py-4.4.0.gh.tar.gz 4637656 BLAKE2B 40b0909c27cefb399353cc2d1d82d7ad3d64e4b3e5ae001ffef9c198d0e65d906f5772a0ac33b599c7fb6ffc5dfad461bb4b9042c5c4fb23dfbfceb0a7facbc0 SHA512 8992f160de7817c48893f3a8588d5c0398dcfb91830a61b4218206adc88185acb102b072507d3064b4a7aade5c957267e5d0e6912510bb106eea834cf9250fab
 EBUILD redis-py-4.3.4.ebuild 1761 BLAKE2B 34745dde86f9477eabadfaa7119608dbf4d8fecd4f4f0ca5ef379b4b5e358d4d73dc4a5625f46a35431ad893f923bf69721a672df263cbcbe19266d151c88a0e SHA512 49db4fe89644c425139a5ebde1ef8c33c0806bda52c602a1c9665fcc96e36cf824798a4dbf4751a239da6a30b71eb7a4e5d4c6e44587a027549b3ff6ac5abcf9
 EBUILD redis-py-4.3.5.ebuild 1719 BLAKE2B acd412fd7b3c46b46e6b6338038031e970e8e43a8532b347ca2c362022749215a5d01373e06001fd226eb54d40b73771d67c51434992c20c26a285816daddc6e SHA512 53d1d2017efc2ea7ebb4b1653663bdddf159adc469fd72c13f411b90bcaf62863d78c0759fa8da04d58d017894838ca49736d913f87b95fa1376590b8423d64a
-EBUILD redis-py-4.4.0.ebuild 1740 BLAKE2B 2b27c4974c15ec83214271b2af415394b6b2776c73bb740c7096ea721c3eb1fa453047466ca9b4847a69ec0b44df400b8051e8303b70e924139eefba2b7e9175 SHA512 79bbfa9350e6c66b797ff7f9513e80288b8d713f21776e3fefa4d1c8a795d44396578f02c5aaff5fe97190089431070cc3deace596d45609e6b74bb8fa0844e4
+EBUILD redis-py-4.4.0.ebuild 1748 BLAKE2B d8947413670056df529e6ebf26f6e3c0bdd0dcaedb8436c1d427f80b2ef895e0173e97dd1dc3010d6ba666a1eb258e4989dda5909daf0064640343318f1e4b2a SHA512 04c0793d1308c39f1d93e8525996a53a193033f7c8f42b7ed4f33955772762e38ce91fa825e51279d8fc1c5180c14e0182f51c91aab68f39106214efef821682
 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis-py/redis-py-4.4.0.ebuild b/dev-python/redis-py/redis-py-4.4.0.ebuild
index 928539d1ddbb..39794f5a9cfe 100644
--- a/dev-python/redis-py/redis-py-4.4.0.ebuild
+++ b/dev-python/redis-py/redis-py-4.4.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		<dev-db/redis-7
+		dev-db/redis
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
@@ -41,6 +41,8 @@ python_test() {
 		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
 		# TODO
 		tests/test_commands.py::TestRedisCommands::test_acl_list
+		# redis-7 different return
+		tests/test_commands.py::TestRedisCommands::test_xautoclaim
 	)
 
 	# TODO: try to run more servers?
@@ -51,17 +53,22 @@ src_test() {
 	local redis_pid="${T}"/redis.pid
 	local redis_port=6379
 
+	if has_version ">=dev-db/redis-7"; then
+		local extra_conf="
+			enable-debug-command yes
+			enable-module-command yes
+		"
+	fi
+
 	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
 	einfo "Spawning Redis"
 	einfo "NOTE: Port ${redis_port} must be free"
-	# "${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
 	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
 		daemonize yes
 		pidfile ${redis_pid}
 		port ${redis_port}
-		bind 127.0.0.1
+		bind 127.0.0.1 ::1
+		${extra_conf}
 	EOF
 
 	# Run the tests
-- 
cgit v1.2.3