From 53c08d5565c49df49c16dcb3b94eccef0432cdd8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 21 Oct 2022 14:19:04 +0200 Subject: [PATCH] Disable `ZRANGESTORE` with binary keys. Seems something is off in Redis' that causes a Redis crash. Closes #2441 --- .../DefaultReactiveZSetOperationsIntegrationTests.java | 7 ++++--- .../collections/AbstractRedisZSetTestIntegration.java | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/springframework/data/redis/core/DefaultReactiveZSetOperationsIntegrationTests.java b/src/test/java/org/springframework/data/redis/core/DefaultReactiveZSetOperationsIntegrationTests.java index edb60907e..e2beaf616 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultReactiveZSetOperationsIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultReactiveZSetOperationsIntegrationTests.java @@ -18,8 +18,6 @@ package org.springframework.data.redis.core; import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assumptions.*; -import reactor.test.StepVerifier; - import java.time.Duration; import java.util.Arrays; import java.util.Collection; @@ -28,7 +26,6 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; - import org.springframework.data.domain.Range; import org.springframework.data.redis.ByteBufferObjectFactory; import org.springframework.data.redis.ObjectFactory; @@ -44,6 +41,8 @@ import org.springframework.data.redis.test.condition.EnabledOnCommand; import org.springframework.data.redis.test.extension.parametrized.MethodSource; import org.springframework.data.redis.test.extension.parametrized.ParameterizedRedisTest; +import reactor.test.StepVerifier; + /** * Integration tests for {@link DefaultReactiveZSetOperations}. * @@ -441,6 +440,7 @@ public class DefaultReactiveZSetOperationsIntegrationTests { } @ParameterizedRedisTest // GH-2345 + @Disabled("https://github.com/spring-projects/spring-data-redis/issues/2441") void rangeAndStoreByScore() { assumeThat(valueFactory instanceof ByteBufferObjectFactory).isFalse(); @@ -486,6 +486,7 @@ public class DefaultReactiveZSetOperationsIntegrationTests { } @ParameterizedRedisTest // GH-2345 + @Disabled("https://github.com/spring-projects/spring-data-redis/issues/2441") void reverseRangeAndStoreByScore() { assumeThat(valueFactory instanceof ByteBufferObjectFactory).isFalse(); diff --git a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisZSetTestIntegration.java b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisZSetTestIntegration.java index 73ddffe1e..e220a1ea2 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisZSetTestIntegration.java +++ b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisZSetTestIntegration.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; import org.assertj.core.data.Offset; import org.junit.jupiter.api.BeforeEach; - +import org.junit.jupiter.api.Disabled; import org.springframework.data.domain.Range; import org.springframework.data.redis.DoubleAsStringObjectFactory; import org.springframework.data.redis.DoubleObjectFactory; @@ -610,6 +610,7 @@ public abstract class AbstractRedisZSetTestIntegration extends AbstractRedisC } @ParameterizedRedisTest // GH-2345 + @Disabled("https://github.com/spring-projects/spring-data-redis/issues/2441") void testRangeAndStoreByScore() { T t1 = getT(); @@ -625,6 +626,7 @@ public abstract class AbstractRedisZSetTestIntegration extends AbstractRedisC } @ParameterizedRedisTest // GH-2345 + @Disabled("https://github.com/spring-projects/spring-data-redis/issues/2441") void testRangeAndStoreRevByScore() { T t1 = getT();