(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 e3dfba82dd OAK-9796: oak-segment-remote Redis tests fail with ARM 
processor (Apple M1)
     new 90d595d028 Merge pull request #1218 from mreutegg/OAK-9796
e3dfba82dd is described below

commit e3dfba82dd2f8b697c19895746836e446f06d9cb
Author: Marcel Reutegger <marcel.reuteg...@gmail.com>
AuthorDate: Thu Nov 16 12:06:12 2023 +0100

    OAK-9796: oak-segment-remote Redis tests fail with ARM processor (Apple M1)
    
    Switch to more recent version of embedded-redis
---
 oak-segment-remote/pom.xml                               |  4 ++--
 .../remote/persistentcache/PersistentRedisCacheTest.java | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/oak-segment-remote/pom.xml b/oak-segment-remote/pom.xml
index 04385ccdd6..0be3392cdb 100644
--- a/oak-segment-remote/pom.xml
+++ b/oak-segment-remote/pom.xml
@@ -151,9 +151,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.kstyrc</groupId>
+            <groupId>com.github.codemonstur</groupId>
             <artifactId>embedded-redis</artifactId>
-            <version>0.6</version>
+            <version>1.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
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 c8bf3f3c5d..2df5d85024 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
@@ -23,10 +23,11 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import redis.embedded.RedisExecProvider;
 import redis.embedded.RedisServer;
+import redis.embedded.core.ExecutableProviderBuilder;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -40,27 +41,26 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 public class PersistentRedisCacheTest extends AbstractPersistentCacheTest {
 
+    private static final String REDIS_HOST = "127.0.0.1";
+
     private RedisServer redisServer;
     private IOMonitorAdapter ioMonitorAdapter;
 
     @Before
     public void setUp() throws Exception {
-        Path redisTempExecutable = 
RedisExecProvider.defaultProvider().get().toPath();
+        Path redisTempExecutable = new 
ExecutableProviderBuilder().addProvidedVersions().build().get().toPath();
         Path redisTargetExecutable = new File("target", 
redisTempExecutable.getFileName().toString()).toPath();
         Files.copy(redisTempExecutable, redisTargetExecutable, 
StandardCopyOption.REPLACE_EXISTING);
-        RedisExecProvider execProvider = mock(RedisExecProvider.class);
-        when(execProvider.get()).thenReturn(redisTargetExecutable.toFile());
-        redisServer = RedisServer.builder().setting("maxmemory 
768mb").redisExecProvider(execProvider).build();
+        redisServer = RedisServer.newRedisServer().setting("maxmemory 
768mb").bind(REDIS_HOST).executableProvider(redisTargetExecutable::toFile).build();
         redisServer.start();
         int port = redisServer.ports().get(0);
         ioMonitorAdapter = mock(IOMonitorAdapter.class);
 
         persistentCache = new PersistentRedisCache(
-                "localhost",
+                REDIS_HOST,
                 port,
                 -1,
                 10000,
@@ -74,7 +74,7 @@ public class PersistentRedisCacheTest extends 
AbstractPersistentCacheTest {
     }
 
     @After
-    public void tearDown() {
+    public void tearDown() throws IOException {
         redisServer.stop();
     }