From 20090756c1238cd71e9e5e4715664cfb68f601ef Mon Sep 17 00:00:00 2001 From: qifanwang Date: Mon, 30 Dec 2024 16:37:05 +0800 Subject: [PATCH] adjust parm for timeout --- core/src/test/java/com/ctrip/xpipe/AbstractTest.java | 2 +- .../redis/keeper/impl/DefaultRedisMasterReplicationTest.java | 3 ++- .../keeper/impl/fakeredis/FakeRedisHalfRdbServerFail.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/test/java/com/ctrip/xpipe/AbstractTest.java b/core/src/test/java/com/ctrip/xpipe/AbstractTest.java index 1b99774567..64b2226690 100644 --- a/core/src/test/java/com/ctrip/xpipe/AbstractTest.java +++ b/core/src/test/java/com/ctrip/xpipe/AbstractTest.java @@ -194,7 +194,7 @@ protected boolean assertSuccess(Runnable assertion) { protected void waitConditionUntilTimeOut(BooleanSupplier booleanSupplier) throws TimeoutException { - waitConditionUntilTimeOut(booleanSupplier, 5000, 2); + waitConditionUntilTimeOut(booleanSupplier, 15000, 2); } protected void waitConditionUntilTimeOut(BooleanSupplier booleanSupplier, int waitTimeMilli) throws TimeoutException { diff --git a/redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/impl/DefaultRedisMasterReplicationTest.java b/redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/impl/DefaultRedisMasterReplicationTest.java index ba85dab57d..d53ebd1c95 100644 --- a/redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/impl/DefaultRedisMasterReplicationTest.java +++ b/redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/impl/DefaultRedisMasterReplicationTest.java @@ -13,6 +13,7 @@ import com.ctrip.xpipe.redis.keeper.config.DefaultKeeperConfig; import com.ctrip.xpipe.redis.keeper.config.DefaultKeeperResourceManager; import com.ctrip.xpipe.redis.keeper.config.KeeperResourceManager; +import com.ctrip.xpipe.redis.keeper.config.TestKeeperConfig; import com.ctrip.xpipe.redis.keeper.monitor.KeeperMonitor; import com.ctrip.xpipe.simpleserver.Server; import com.ctrip.xpipe.utils.DefaultLeakyBucket; @@ -81,7 +82,7 @@ public void beforeDefaultRedisMasterReplicationTest() throws Exception { defaultRedisMasterReplication = new DefaultRedisMasterReplication(redisMaster, redisKeeperServer, nioEventLoopGroup, scheduled, proxyResourceManager); when(redisKeeperServer.getRedisKeeperServerState()).thenReturn(new RedisKeeperServerStateActive(redisKeeperServer)); - when(redisKeeperServer.getKeeperConfig()).thenReturn(new DefaultKeeperConfig()); + when(redisKeeperServer.getKeeperConfig()).thenReturn(new TestKeeperConfig()); when(redisMaster.getCurrentReplicationStore()).thenReturn(replicationStore); when(replicationStore.getMetaStore()).thenReturn(metaStore); diff --git a/redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/impl/fakeredis/FakeRedisHalfRdbServerFail.java b/redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/impl/fakeredis/FakeRedisHalfRdbServerFail.java index 66c1e956ae..e1adc91bbe 100644 --- a/redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/impl/fakeredis/FakeRedisHalfRdbServerFail.java +++ b/redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/impl/fakeredis/FakeRedisHalfRdbServerFail.java @@ -67,7 +67,7 @@ public void redisFailKeeperRestartDumpNewRdb() throws Exception { SimplePsyncObserver simplePsyncObserver = new SimplePsyncObserver(); InMemoryPsync inMemoryPsync = sendInmemoryPsync("localhost", redisKeeperServer.getListeningPort(), simplePsyncObserver); //wait - simplePsyncObserver.getOnline().get(5000, TimeUnit.MILLISECONDS); + simplePsyncObserver.getOnline().get(6000, TimeUnit.MILLISECONDS); //wait for commands sleep(1000);