wait for more time for specific size

Author: wenchaomeng

redis/redis-core/src/test/java/com/ctrip/xpipe/redis/core/server/FakeRedisServer.java

@@ -134,7 +134,7 @@ public void addCommandsListener(FakeRedisServerAction fakeRedisServerAction) {
 	}
 
 
-	public Object currentCommands() {
+	public String currentCommands() {
 		return commands;
 	}
 

redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/AbstractRedisKeeperTest.java

@@ -180,13 +180,13 @@ public void beforeFileData() {
 		return new String(bachannel.getResult());
 	}
 
-	public String readCommandFileTilEnd(final ReplicationStore replicationStore) throws IOException {
+	public String readCommandFileTilEnd(final ReplicationStore replicationStore, int expectedLen) throws IOException {
 
-		return readCommandFileTilEnd(0, replicationStore);
+		return readCommandFileTilEnd(0, replicationStore, expectedLen);
 	}
 
 
-	public String readCommandFileTilEnd(final long beginOffset, final ReplicationStore replicationStore) throws IOException {
+	public String readCommandFileTilEnd(final long beginOffset, final ReplicationStore replicationStore, int expectedLen) throws IOException {
 
 		final ByteArrayOutputStream baous = new ByteArrayOutputStream();
 		new Thread() {
@@ -195,11 +195,11 @@ public void run() {
 				try {
 					doRun();
 				} catch (Exception e) {
-					e.printStackTrace();
+					logger.error("[run]", e);
 				}
 			}
 
-			private void doRun() throws IOException {
+			private void doRun() throws IOException{
 				replicationStore.addCommandsListener(replicationStore.beginOffsetWhenCreated() + beginOffset, new CommandsListener() {
 
 					@Override
@@ -231,13 +231,16 @@ public ChannelFuture onCommand(ReferenceFileRegion referenceFileRegion) {
 		long equalCount = 0;
 		while (true) {
 			int currentSize = baous.size();
+			if(expectedLen >= 0 && currentSize >= expectedLen){
+				break;
+			}
 			if (currentSize != lastSize) {
 				lastSize = currentSize;
 				equalCount = 0;
 			} else {
 				equalCount++;
 			}
-			if (equalCount > 10) {
+			if (equalCount > 100) {
 				break;
 			}
 			sleep(10);

redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/impl/fakeredis/DefaultRedisKeeperServerConnectToFakeRedisTest.java

@@ -28,7 +28,7 @@ public void testReplicationData() throws Exception{
 		String rdbContent = readRdbFileTilEnd(replicationStore);
 		Assert.assertEquals(fakeRedisServer.getRdbContent(), rdbContent);
 
-		String commands = readCommandFileTilEnd(replicationStore);
+		String commands = readCommandFileTilEnd(replicationStore, fakeRedisServer.currentCommands().length());
 		Assert.assertEquals(fakeRedisServer.currentCommands(), commands);
 	}
 

redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/protocal/cmd/PsyncTest.java

@@ -255,7 +255,7 @@ private void assertResult() throws IOException, InterruptedException {
 		replicationStore = (DefaultReplicationStore) replicationStoreManager.getCurrent();
 
 		String rdbResult = readRdbFileTilEnd(replicationStore);
-		String commandResult = readCommandFileTilEnd(replicationStore);
+		String commandResult = readCommandFileTilEnd(replicationStore, commandContent.length());
 
 		if(!isPartial){
 			Assert.assertEquals(rdbContent, rdbResult);

redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/store/DefaultReplicationStoreTest.java

@@ -144,7 +144,7 @@ public void testReadWrite() throws Exception {
 			buf.writeBytes(cmd.getBytes());
 			store.getCommandStore().appendCommands(buf);
 		}
-		String result = readCommandFileTilEnd(store);
+		String result = readCommandFileTilEnd(store, exp.length());
 		assertEquals(exp.toString(), result);
 		store.close();
 	}