From 481057ba9749f827809d1d717de447a02fcef191 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 5 Oct 2022 13:59:00 +0200 Subject: [PATCH] Disable tests based on system architecture. Redis has issues with numeric representation of floating point numbers which causes tests to fail on M1. See: redis/redis#3768 Closes: #2424 --- .../connection/AbstractConnectionIntegrationTests.java | 6 +++++- .../core/DefaultReactiveHashOperationsIntegrationTests.java | 3 +++ .../DefaultReactiveValueOperationsIntegrationTests.java | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java index ffb6de91d..bf0d4fa42 100644 --- a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java @@ -18,6 +18,7 @@ package org.springframework.data.redis.connection; import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assumptions.*; import static org.awaitility.Awaitility.*; +import static org.junit.jupiter.api.condition.OS.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldIncrBy.Overflow.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldType.*; @@ -41,7 +42,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.condition.DisabledOnOs; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.data.domain.Range; @@ -1259,6 +1260,7 @@ public abstract class AbstractConnectionIntegrationTests { } @Test + @DisabledOnOs(value = MAC, architectures = "aarch64") void testIncrByDouble() { actual.add(connection.set("tdb", "4.5")); @@ -2467,6 +2469,7 @@ public abstract class AbstractConnectionIntegrationTests { } @Test + @DisabledOnOs(value = MAC, architectures = "aarch64") void testHIncrByDouble() { actual.add(connection.hSet("test", "key", "2.9")); actual.add(connection.hIncrBy("test", "key", 3.5)); @@ -2648,6 +2651,7 @@ public abstract class AbstractConnectionIntegrationTests { } @Test // DATAREDIS-417 + @DisabledOnOs(value = MAC, architectures = "aarch64") public void scanShouldReadEntireValueRangeWhenIdividualScanIterationsReturnEmptyCollection() { connection.execute("DEBUG", "POPULATE".getBytes(), "100".getBytes()); diff --git a/src/test/java/org/springframework/data/redis/core/DefaultReactiveHashOperationsIntegrationTests.java b/src/test/java/org/springframework/data/redis/core/DefaultReactiveHashOperationsIntegrationTests.java index b3335d850..c4478a461 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultReactiveHashOperationsIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultReactiveHashOperationsIntegrationTests.java @@ -17,7 +17,9 @@ package org.springframework.data.redis.core; import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assumptions.*; +import static org.junit.jupiter.api.condition.OS.*; +import org.junit.jupiter.api.condition.DisabledOnOs; import org.springframework.data.redis.connection.convert.Converters; import reactor.test.StepVerifier; @@ -305,6 +307,7 @@ public class DefaultReactiveHashOperationsIntegrationTests { } @ParameterizedRedisTest // DATAREDIS-602 + @DisabledOnOs(value = MAC, architectures = "aarch64") @SuppressWarnings("unchecked") void incrementDouble() { diff --git a/src/test/java/org/springframework/data/redis/core/DefaultReactiveValueOperationsIntegrationTests.java b/src/test/java/org/springframework/data/redis/core/DefaultReactiveValueOperationsIntegrationTests.java index 617de44fd..5fcf9eb1f 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultReactiveValueOperationsIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultReactiveValueOperationsIntegrationTests.java @@ -17,11 +17,13 @@ package org.springframework.data.redis.core; import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; +import static org.junit.jupiter.api.condition.OS.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldIncrBy.Overflow.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldType.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.Offset.offset; +import org.junit.jupiter.api.condition.DisabledOnOs; import reactor.test.StepVerifier; import java.nio.ByteBuffer; @@ -453,6 +455,7 @@ public class DefaultReactiveValueOperationsIntegrationTests { } @ParameterizedRedisTest // DATAREDIS-784 + @DisabledOnOs(value = MAC, architectures = "aarch64") void incrementByFloatDelta() { K key = keyFactory.instance();