Skip to content

Commit dccbdfe

Browse files
mp911dechristophstrobl
authored andcommitted
DATAREDIS-580 - Move Master/Slave test to Sentinel integration test class.
Reuse guards to make sure we can use a slave server.
1 parent 7b6d47d commit dccbdfe

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import static org.junit.Assert.*;
2222
import static org.junit.Assume.*;
2323

24-
import io.lettuce.core.ReadFrom;
2524
import io.lettuce.core.EpollProvider;
2625
import io.lettuce.core.KqueueProvider;
26+
import io.lettuce.core.ReadFrom;
2727
import io.lettuce.core.RedisException;
2828
import io.lettuce.core.api.async.RedisAsyncCommands;
2929
import io.lettuce.core.api.reactive.BaseRedisReactiveCommands;

src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelIntegrationTests.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@
3535
import org.junit.runners.Parameterized;
3636
import org.junit.runners.Parameterized.Parameters;
3737
import org.springframework.data.redis.ConnectionFactoryTracker;
38+
import org.springframework.data.redis.SettingsUtils;
3839
import org.springframework.data.redis.connection.AbstractConnectionIntegrationTests;
3940
import org.springframework.data.redis.connection.DefaultStringRedisConnection;
41+
import org.springframework.data.redis.connection.RedisConnection;
4042
import org.springframework.data.redis.connection.RedisSentinelConfiguration;
4143
import org.springframework.data.redis.connection.RedisSentinelConnection;
4244
import org.springframework.data.redis.connection.RedisServer;
@@ -210,4 +212,26 @@ public void factoryWithReadFromSlaveSettings() {
210212
connection.close();
211213
}
212214
}
215+
216+
@Test // DATAREDIS-580
217+
public void factoryUsesMasterSlaveConnections() {
218+
219+
LettuceClientConfiguration configuration = LettuceTestClientConfiguration.builder().readFrom(ReadFrom.SLAVE)
220+
.build();
221+
222+
LettuceConnectionFactory factory = new LettuceConnectionFactory(SettingsUtils.standaloneConfiguration(),
223+
configuration);
224+
factory.afterPropertiesSet();
225+
226+
RedisConnection connection = factory.getConnection();
227+
228+
try {
229+
assertThat(connection.ping(), is(equalTo("PONG")));
230+
assertThat(connection.info().getProperty("role"), is(equalTo("slave")));
231+
} finally {
232+
this.connection.close();
233+
}
234+
235+
factory.destroy();
236+
}
213237
}

0 commit comments

Comments
 (0)