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

Merge branch 'master' of https://github.com/ivowiblo/jedis

Browse Source 
Conflicts:
	src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java
This commit is contained in:
Jonathan Leibiusky
2011-12-13 18:08:17 -03:00
parent f27f809fa3 d97f30a01a
commit cb1b19b5d4
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java
View File

@@ -32,13 +32,13 @@ public class ShardedJedisPipelineTest {
jedis.flushAll();
jedis.disconnect();
JedisShardInfo shardInfo1 = new JedisShardInfo(redis1.host, redis1.port);
JedisShardInfo shardInfo2 = new JedisShardInfo(redis2.host, redis2.port);
shardInfo1.setPassword("foobared");
shardInfo2.setPassword("foobared");
List<JedisShardInfo> shards = new ArrayList<JedisShardInfo>();
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);
shards.add(shardInfo1);
shards.add(shardInfo2);
this.jedis = new ShardedJedis(shards);
}
@@ -53,7 +53,6 @@ public class ShardedJedisPipelineTest {
assertEquals(2, results.size());
assertEquals("OK", results.get(0));
assertEquals("bar", results.get(1));
}
@Test

7
src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java
View File

@@ -29,8 +29,13 @@ public class ControlCommandsTest extends JedisCommandTestBase {
@Test
public void bgrewriteaof() {
String scheduled = "Background append only file rewriting scheduled";
String started = "Background append only file rewriting started";
String status = jedis.bgrewriteaof();
assertEquals("Background append only file rewriting started", status);
boolean ok = status.equals(scheduled) || status.equals(started);
assertTrue(ok);
}
@Test