Skip to content

Commit cdb15ce

Browse files
committed
Add workarounds for IPv6 bug in tests
1 parent 412b293 commit cdb15ce

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

tests/test_asyncio/test_cluster.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -380,20 +380,22 @@ async def test_cluster_retry_object(self, request: FixtureRequest) -> None:
380380
async with RedisCluster.from_url(url) as rc_default:
381381
# Test default retry
382382
retry = rc_default.connection_kwargs.get("retry")
383+
384+
# FIXME: Workaround for https://github.com/redis/redis-py/issues/3030
385+
host = rc_default.get_default_node().host
386+
383387
assert isinstance(retry, Retry)
384388
assert retry._retries == 3
385389
assert isinstance(retry._backoff, type(default_backoff()))
386-
assert rc_default.get_node("127.0.0.1", 16379).connection_kwargs.get(
390+
assert rc_default.get_node(host, 16379).connection_kwargs.get(
387391
"retry"
388-
) == rc_default.get_node("127.0.0.1", 16380).connection_kwargs.get("retry")
392+
) == rc_default.get_node(host, 16380).connection_kwargs.get("retry")
389393

390394
retry = Retry(ExponentialBackoff(10, 5), 5)
391395
async with RedisCluster.from_url(url, retry=retry) as rc_custom_retry:
392396
# Test custom retry
393397
assert (
394-
rc_custom_retry.get_node("127.0.0.1", 16379).connection_kwargs.get(
395-
"retry"
396-
)
398+
rc_custom_retry.get_node(host, 16379).connection_kwargs.get("retry")
397399
== retry
398400
)
399401

@@ -402,17 +404,15 @@ async def test_cluster_retry_object(self, request: FixtureRequest) -> None:
402404
) as rc_no_retries:
403405
# Test no connection retries
404406
assert (
405-
rc_no_retries.get_node("127.0.0.1", 16379).connection_kwargs.get(
406-
"retry"
407-
)
407+
rc_no_retries.get_node(host, 16379).connection_kwargs.get("retry")
408408
is None
409409
)
410410

411411
async with RedisCluster.from_url(
412412
url, retry=Retry(NoBackoff(), 0)
413413
) as rc_no_retries:
414414
assert (
415-
rc_no_retries.get_node("127.0.0.1", 16379)
415+
rc_no_retries.get_node(host, 16379)
416416
.connection_kwargs.get("retry")
417417
._retries
418418
== 0

tests/test_cluster.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -862,21 +862,22 @@ def test_cluster_get_set_retry_object(self, request):
862862

863863
def test_cluster_retry_object(self, r) -> None:
864864
# Test default retry
865+
# FIXME: Workaround for https://github.com/redis/redis-py/issues/3030
866+
host = r.get_default_node().host
867+
865868
retry = r.get_connection_kwargs().get("retry")
866869
assert isinstance(retry, Retry)
867870
assert retry._retries == 0
868871
assert isinstance(retry._backoff, type(default_backoff()))
869-
node1 = r.get_node("127.0.0.1", 16379).redis_connection
870-
node2 = r.get_node("127.0.0.1", 16380).redis_connection
872+
node1 = r.get_node(host, 16379).redis_connection
873+
node2 = r.get_node(host, 16380).redis_connection
871874
assert node1.get_retry()._retries == node2.get_retry()._retries
872875

873876
# Test custom retry
874877
retry = Retry(ExponentialBackoff(10, 5), 5)
875-
rc_custom_retry = RedisCluster("127.0.0.1", 16379, retry=retry)
878+
rc_custom_retry = RedisCluster(host, 16379, retry=retry)
876879
assert (
877-
rc_custom_retry.get_node("127.0.0.1", 16379)
878-
.redis_connection.get_retry()
879-
._retries
880+
rc_custom_retry.get_node(host, 16379).redis_connection.get_retry()._retries
880881
== retry._retries
881882
)
882883

0 commit comments

Comments
 (0)