rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply "Format" to all files, Closes #765

Browse Source
This commit is contained in:
Jungtaek Lim
2014-10-09 21:08:05 +09:00
parent 4db138921e
commit 7f45a2ca24
63 changed files with 1243 additions and 1100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/java/redis/clients/jedis/tests/JedisSentinelTest.java
View File

@@ -22,8 +22,8 @@ public class JedisSentinelTest extends JedisTestBase {
protected static HostAndPort master = HostAndPortUtil.getRedisServers()
.get(0);
protected static HostAndPort slave = HostAndPortUtil.getRedisServers()
.get(4);
protected static HostAndPort slave = HostAndPortUtil.getRedisServers().get(
4);
protected static HostAndPort sentinel = HostAndPortUtil
.getSentinelServers().get(0);
@@ -86,15 +86,17 @@ public class JedisSentinelTest extends JedisTestBase {
Jedis j = new Jedis(sentinelForFailover.getHost(),
sentinelForFailover.getPort());
Jedis j2 = new Jedis(sentinelForFailover.getHost(),
sentinelForFailover.getPort());
sentinelForFailover.getPort());
try {
List<String> masterHostAndPort = j
.sentinelGetMasterAddrByName(FAILOVER_MASTER_NAME);
HostAndPort currentMaster = new HostAndPort(masterHostAndPort.get(0),
HostAndPort currentMaster = new HostAndPort(
masterHostAndPort.get(0),
Integer.parseInt(masterHostAndPort.get(1)));
JedisSentinelTestUtil.waitForNewPromotedMaster(FAILOVER_MASTER_NAME, j, j2);
JedisSentinelTestUtil.waitForNewPromotedMaster(
FAILOVER_MASTER_NAME, j, j2);
masterHostAndPort = j
.sentinelGetMasterAddrByName(FAILOVER_MASTER_NAME);
@@ -204,5 +206,5 @@ public class JedisSentinelTest extends JedisTestBase {
j.close();
}
}
}