diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1be1599a35..bb66ffefd7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: sh install.sh - name: Cache Maven packages - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-2022-11-30-${{ hashFiles('**/pom.xml') }} diff --git a/core/src/test/java/com/ctrip/xpipe/AbstractTest.java b/core/src/test/java/com/ctrip/xpipe/AbstractTest.java index 1b99774567..4b31340156 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, 10000, 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 a8552caf7c..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 @@ -10,8 +10,10 @@ import com.ctrip.xpipe.redis.keeper.AbstractRedisKeeperTest; import com.ctrip.xpipe.redis.keeper.RedisKeeperServer; import com.ctrip.xpipe.redis.keeper.RedisMaster; +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; @@ -80,6 +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 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/DefaultRedisKeeperServerConnectToFakeRedisTest.java b/redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/impl/fakeredis/DefaultRedisKeeperServerConnectToFakeRedisTest.java index b8b7045d78..944fa1be9a 100644 --- a/redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/impl/fakeredis/DefaultRedisKeeperServerConnectToFakeRedisTest.java +++ b/redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/impl/fakeredis/DefaultRedisKeeperServerConnectToFakeRedisTest.java @@ -55,7 +55,7 @@ private void startKeeperServerAndTestReFullSync(int fileToKeep, int maxTransferC RedisKeeperServer redisKeeperServer = startRedisKeeperServerAndConnectToFakeRedis(fileToKeep, maxTransferCommnadsSize, 1000); int keeperPort = redisKeeperServer.getListeningPort(); - sleep(3000); + sleep(5000); logger.info(remarkableMessage("send psync to redump rdb")); int rdbDumpCount1 = ((DefaultReplicationStore)redisKeeperServer.getReplicationStore()).getRdbUpdateCount(); 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..ff95740c46 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 @@ -44,7 +44,7 @@ public void redisFailWhileSendingRdb() throws Exception { logger.info(remarkableMessage("[redisFailWhileSendingRdb]")); InMemoryPsync inMemoryPsync = sendInmemoryPsync("localhost", redisKeeperServer.getListeningPort()); - sleep(1500); + sleep(3000); assertPsyncResultEquals(inMemoryPsync); } @@ -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); diff --git a/redis/redis-proxy/src/test/java/com/ctrip/xpipe/redis/proxy/handler/BackendSessionHandlerTest.java b/redis/redis-proxy/src/test/java/com/ctrip/xpipe/redis/proxy/handler/BackendSessionHandlerTest.java index 56cd65b240..c3456930d0 100644 --- a/redis/redis-proxy/src/test/java/com/ctrip/xpipe/redis/proxy/handler/BackendSessionHandlerTest.java +++ b/redis/redis-proxy/src/test/java/com/ctrip/xpipe/redis/proxy/handler/BackendSessionHandlerTest.java @@ -12,6 +12,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -76,7 +77,7 @@ public void testByteBufReleasedAfterPipelineBroken() { ByteBuf byteBuf = Unpooled.copiedBuffer("test".getBytes()); channel.writeInbound(byteBuf); Assert.assertEquals(0, byteBuf.refCnt()); - Assert.assertFalse(channel.isOpen()); + Mockito.verify(session).release(); } } \ No newline at end of file diff --git a/redis/redis-proxy/src/test/java/com/ctrip/xpipe/redis/proxy/handler/FrontendSessionNettyHandlerTest.java b/redis/redis-proxy/src/test/java/com/ctrip/xpipe/redis/proxy/handler/FrontendSessionNettyHandlerTest.java index a28e6b307c..5212416ddb 100644 --- a/redis/redis-proxy/src/test/java/com/ctrip/xpipe/redis/proxy/handler/FrontendSessionNettyHandlerTest.java +++ b/redis/redis-proxy/src/test/java/com/ctrip/xpipe/redis/proxy/handler/FrontendSessionNettyHandlerTest.java @@ -15,6 +15,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -114,7 +115,7 @@ public void testByteBufReleasedAfterPipelineBroken() { ByteBuf byteBuf = Unpooled.copiedBuffer("test".getBytes()); channel.writeInbound(byteBuf); Assert.assertEquals(0, byteBuf.refCnt()); - Assert.assertFalse(channel.isOpen()); + Mockito.verify(session).release(); } } \ No newline at end of file