(jackrabbit-oak) branch trunk updated: OAK-9796: oak-segment-remote Redis tests fail with ARM processor (Apple M1)

[mreutegg]

This is an automated email from the ASF dual-hosted git repository.

mreutegg pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 9a3deea518 OAK-9796: oak-segment-remote Redis tests fail with ARM 
processor (Apple M1)
     new e568fe4f19 Merge pull request #1221 from mreutegg/OAK-9796-2
9a3deea518 is described below

commit 9a3deea518be34ebd6754a025f60dc9181c373cd
Author: Marcel Reutegger <marcel.reuteg...@gmail.com>
AuthorDate: Mon Nov 20 12:06:09 2023 +0100

    OAK-9796: oak-segment-remote Redis tests fail with ARM processor (Apple M1)
    
    Skip test if redis cannot be started
---
 .../segment/remote/persistentcache/PersistentRedisCacheTest.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCacheTest.java
 
b/oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCacheTest.java
index 2df5d85024..17804ed195 100644
--- 
a/oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCacheTest.java
+++ 
b/oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCacheTest.java
@@ -20,6 +20,7 @@ package 
org.apache.jackrabbit.oak.segment.remote.persistentcache;
 import org.apache.jackrabbit.oak.commons.Buffer;
 import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitorAdapter;
 import org.junit.After;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -55,7 +56,11 @@ public class PersistentRedisCacheTest extends 
AbstractPersistentCacheTest {
         Path redisTargetExecutable = new File("target", 
redisTempExecutable.getFileName().toString()).toPath();
         Files.copy(redisTempExecutable, redisTargetExecutable, 
StandardCopyOption.REPLACE_EXISTING);
         redisServer = RedisServer.newRedisServer().setting("maxmemory 
768mb").bind(REDIS_HOST).executableProvider(redisTargetExecutable::toFile).build();
-        redisServer.start();
+        try {
+            redisServer.start();
+        } catch (IOException e) {
+            Assume.assumeNoException(e);
+        }
         int port = redisServer.ports().get(0);
         ioMonitorAdapter = mock(IOMonitorAdapter.class);