Pipeline tests are authenticated. bgrewriteaof command test now supports scheduled status.
This commit is contained in:
@@ -24,15 +24,21 @@ public class SharedJedisPipelineTest {
|
|||||||
@Before
|
@Before
|
||||||
public void setUp() throws Exception {
|
public void setUp() throws Exception {
|
||||||
Jedis jedis = new Jedis(redis1.host, redis1.port);
|
Jedis jedis = new Jedis(redis1.host, redis1.port);
|
||||||
|
jedis.auth("foobared");
|
||||||
jedis.flushAll();
|
jedis.flushAll();
|
||||||
jedis.disconnect();
|
jedis.disconnect();
|
||||||
jedis = new Jedis(redis2.host, redis2.port);
|
jedis = new Jedis(redis2.host, redis2.port);
|
||||||
|
jedis.auth("foobared");
|
||||||
jedis.flushAll();
|
jedis.flushAll();
|
||||||
jedis.disconnect();
|
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>();
|
List<JedisShardInfo> shards = new ArrayList<JedisShardInfo>();
|
||||||
shards.add(new JedisShardInfo(redis1.host, redis1.port));
|
shards.add(shardInfo1);
|
||||||
shards.add(new JedisShardInfo(redis2.host, redis2.port));
|
shards.add(shardInfo2);
|
||||||
this.jedis = new ShardedJedis(shards);
|
this.jedis = new ShardedJedis(shards);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -46,7 +52,6 @@ public class SharedJedisPipelineTest {
|
|||||||
assertEquals(2, results.size());
|
assertEquals(2, results.size());
|
||||||
assertEquals("OK", results.get(0));
|
assertEquals("OK", results.get(0));
|
||||||
assertEquals("bar", results.get(1));
|
assertEquals("bar", results.get(1));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -29,8 +29,13 @@ public class ControlCommandsTest extends JedisCommandTestBase {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void bgrewriteaof() {
|
public void bgrewriteaof() {
|
||||||
|
String scheduled = "Background append only file rewriting scheduled";
|
||||||
|
String started = "Background append only file rewriting started";
|
||||||
|
|
||||||
String status = jedis.bgrewriteaof();
|
String status = jedis.bgrewriteaof();
|
||||||
assertEquals("Background append only file rewriting started", status);
|
|
||||||
|
boolean ok = status.equals(scheduled) || status.equals(started);
|
||||||
|
assertTrue(ok);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
Reference in New Issue
Block a user