From fd0c57599ce0020cb1256a44d64dbe6a7509158c Mon Sep 17 00:00:00 2001 From: Yaourt Date: Fri, 16 Sep 2011 17:22:59 +0200 Subject: [PATCH 1/3] Fix broken test due to missing authent --- .../clients/jedis/tests/SharedJedisPipelineTest.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/test/java/redis/clients/jedis/tests/SharedJedisPipelineTest.java b/src/test/java/redis/clients/jedis/tests/SharedJedisPipelineTest.java index 7ca2a52..20f5094 100644 --- a/src/test/java/redis/clients/jedis/tests/SharedJedisPipelineTest.java +++ b/src/test/java/redis/clients/jedis/tests/SharedJedisPipelineTest.java @@ -24,18 +24,25 @@ public class SharedJedisPipelineTest { @Before public void setUp() throws Exception { Jedis jedis = new Jedis(redis1.host, redis1.port); + jedis.auth("foobared"); jedis.flushAll(); jedis.disconnect(); jedis = new Jedis(redis2.host, redis2.port); + jedis.auth("foobared"); jedis.flushAll(); jedis.disconnect(); List shards = new ArrayList(); - shards.add(new JedisShardInfo(redis1.host, redis1.port)); - shards.add(new JedisShardInfo(redis2.host, redis2.port)); + JedisShardInfo si1 = new JedisShardInfo(redis1.host, redis1.port); + si1.setPassword("foobared"); + shards.add(si1); + JedisShardInfo si2 = new JedisShardInfo(redis2.host, redis2.port); + si2.setPassword("foobared"); + shards.add(si2); this.jedis = new ShardedJedis(shards); } + @Test public void pipeline() throws UnsupportedEncodingException { ShardedJedisPipeline p = jedis.pipelined(); From dcba7bd3b34fa221b867ae8b6e4e051a9d36dc90 Mon Sep 17 00:00:00 2001 From: Yaourt Date: Fri, 16 Sep 2011 17:23:59 +0200 Subject: [PATCH 2/3] Rename test : Shar<>edJedisPipelineTest to ShardedJedisPipelineTest --- ...SharedJedisPipelineTest.java => ShardedJedisPipelineTest.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/test/java/redis/clients/jedis/tests/{SharedJedisPipelineTest.java => ShardedJedisPipelineTest.java} (100%) diff --git a/src/test/java/redis/clients/jedis/tests/SharedJedisPipelineTest.java b/src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java similarity index 100% rename from src/test/java/redis/clients/jedis/tests/SharedJedisPipelineTest.java rename to src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java From f82fb50897ed5f1391fda0a85256254a7cd56d13 Mon Sep 17 00:00:00 2001 From: Yaourt Date: Fri, 16 Sep 2011 22:40:39 +0200 Subject: [PATCH 3/3] Update ShardedJedisPipelineTest class name. --- .../redis/clients/jedis/tests/ShardedJedisPipelineTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java b/src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java index 20f5094..22f1d10 100644 --- a/src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java +++ b/src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java @@ -13,7 +13,7 @@ import static junit.framework.Assert.assertNull; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -public class SharedJedisPipelineTest { +public class ShardedJedisPipelineTest { private static HostAndPortUtil.HostAndPort redis1 = HostAndPortUtil.getRedisServers() .get(0); private static HostAndPortUtil.HostAndPort redis2 = HostAndPortUtil.getRedisServers()