From 3286c5e1743f390a4c5cb33678be11f43665a101 Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Wed, 5 Aug 2020 18:30:51 -0400 Subject: [PATCH] Disable Redis persistence for tests. --- .../redis/AbstractRedisClusterTest.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/redis/AbstractRedisClusterTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/redis/AbstractRedisClusterTest.java index a5eeb4cda..76c15eaa5 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/redis/AbstractRedisClusterTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/redis/AbstractRedisClusterTest.java @@ -14,7 +14,6 @@ import redis.embedded.RedisServer; import java.io.File; import java.io.IOException; import java.net.ServerSocket; -import java.net.URISyntaxException; import java.time.Duration; import java.util.Arrays; import java.util.List; @@ -74,21 +73,16 @@ public abstract class AbstractRedisClusterTest { } } - private static RedisServer buildClusterNode(final int port) throws IOException, URISyntaxException { - final File clusterConfigFile = File.createTempFile("redis", ".conf"); - final File rdbFile = File.createTempFile("redis", ".rdb"); - - // Redis struggles with existing-but-empty RDB files - rdbFile.delete(); - rdbFile.deleteOnExit(); + private static RedisServer buildClusterNode(final int port) throws IOException { + final File clusterConfigFile = File.createTempFile("redis", ".conf"); clusterConfigFile.deleteOnExit(); return RedisServer.builder() .setting("cluster-enabled yes") .setting("cluster-config-file " + clusterConfigFile.getAbsolutePath()) .setting("cluster-node-timeout 5000") + .setting("appendonly no") .setting("dir " + System.getProperty("java.io.tmpdir")) - .setting("dbfilename " + rdbFile.getName()) .port(port) .build(); }