This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 0407
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
commit f419ecd5d00a5d622d84cf1b772ac099682c9bc3
Author: jianbin <jian...@apache.org>
AuthorDate: Fri Apr 12 16:06:52 2024 +0800
test: support Redis integration testing
---
.github/workflows/build.yml | 2 +-
.../seata/discovery/registry/redis/RedisRegisterServiceImplTest.java | 2 ++
.../java/org/apache/seata/server/lock/redis/RedisLockManagerTest.java | 2 ++
.../org/apache/seata/server/lock/redis/RedisLuaLockManagerTest.java | 2 ++
.../apache/seata/server/session/redis/RedisDistributedLockerTest.java | 4 +++-
.../server/session/redis/RedisLuaTransactionStoreManagerTest.java | 2 ++
.../org/apache/seata/server/session/redis/RedisQueryConsolTest.java | 2 ++
.../apache/seata/server/session/redis/RedisSessionManagerTest.java | 2 ++
.../seata/server/session/redis/RedisTransactionStoreManagerTest.java | 2 ++
9 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f602448192..d57645eb41 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
run: |
./mvnw -T 4C clean test \
-Dcheckstyle.skip=false -Dpmd.skip=false -Dlicense.skip=false
\
- -Dmaven.git-commit-id.skip=true \
+ -Dmaven.git-commit-id.skip=true -DredisCaseEnabled=true \
-e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
# step 4.2
- name: "Test with Maven and Java${{ matrix.java }}"
diff --git
a/discovery/seata-discovery-redis/src/test/java/org/apache/seata/discovery/registry/redis/RedisRegisterServiceImplTest.java
b/discovery/seata-discovery-redis/src/test/java/org/apache/seata/discovery/registry/redis/RedisRegisterServiceImplTest.java
index 7318746088..ddcdc90b24 100644
---
a/discovery/seata-discovery-redis/src/test/java/org/apache/seata/discovery/registry/redis/RedisRegisterServiceImplTest.java
+++
b/discovery/seata-discovery-redis/src/test/java/org/apache/seata/discovery/registry/redis/RedisRegisterServiceImplTest.java
@@ -20,6 +20,7 @@ import org.apache.seata.common.util.NetUtil;
import org.apache.seata.config.Configuration;
import org.apache.seata.config.ConfigurationFactory;
import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.mockito.MockedStatic;
import org.mockito.internal.util.collections.Sets;
@@ -37,6 +38,7 @@ import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.when;
+@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisRegisterServiceImplTest {
private static RedisRegistryServiceImpl redisRegistryService;
diff --git
a/server/src/test/java/org/apache/seata/server/lock/redis/RedisLockManagerTest.java
b/server/src/test/java/org/apache/seata/server/lock/redis/RedisLockManagerTest.java
index e30aed644e..31a638422c 100644
---
a/server/src/test/java/org/apache/seata/server/lock/redis/RedisLockManagerTest.java
+++
b/server/src/test/java/org/apache/seata/server/lock/redis/RedisLockManagerTest.java
@@ -30,6 +30,7 @@ import org.apache.seata.server.storage.redis.lock.RedisLocker;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import redis.clients.jedis.Jedis;
@@ -39,6 +40,7 @@ import redis.clients.jedis.JedisPoolConfig;
/**
*/
@SpringBootTest
+@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisLockManagerTest {
static LockManager lockManager = null;
diff --git
a/server/src/test/java/org/apache/seata/server/lock/redis/RedisLuaLockManagerTest.java
b/server/src/test/java/org/apache/seata/server/lock/redis/RedisLuaLockManagerTest.java
index 484d808692..dbecd42291 100644
---
a/server/src/test/java/org/apache/seata/server/lock/redis/RedisLuaLockManagerTest.java
+++
b/server/src/test/java/org/apache/seata/server/lock/redis/RedisLuaLockManagerTest.java
@@ -25,6 +25,7 @@ import
org.apache.seata.server.storage.redis.lock.RedisLockManager;
import org.apache.seata.server.storage.redis.lock.RedisLuaLocker;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
@@ -33,6 +34,7 @@ import org.springframework.context.ApplicationContext;
*
*/
@SpringBootTest
+@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisLuaLockManagerTest extends RedisLockManagerTest {
/**
diff --git
a/server/src/test/java/org/apache/seata/server/session/redis/RedisDistributedLockerTest.java
b/server/src/test/java/org/apache/seata/server/session/redis/RedisDistributedLockerTest.java
index 0170b67aef..acf0e17464 100644
---
a/server/src/test/java/org/apache/seata/server/session/redis/RedisDistributedLockerTest.java
+++
b/server/src/test/java/org/apache/seata/server/session/redis/RedisDistributedLockerTest.java
@@ -24,6 +24,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import redis.clients.jedis.Jedis;
@@ -40,6 +41,7 @@ import static
org.apache.seata.server.store.StoreConfig.StoreMode;
*
*/
@SpringBootTest
+@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisDistributedLockerTest {
private String retryRollbacking = "RetryRollbacking";
@@ -121,7 +123,7 @@ public class RedisDistributedLockerTest {
//sleep 60s
try {
- Thread.sleep(2100);
+ Thread.sleep(2000);
} catch (InterruptedException e) {
e.printStackTrace();
}
diff --git
a/server/src/test/java/org/apache/seata/server/session/redis/RedisLuaTransactionStoreManagerTest.java
b/server/src/test/java/org/apache/seata/server/session/redis/RedisLuaTransactionStoreManagerTest.java
index d91663e3dd..8b4d970008 100644
---
a/server/src/test/java/org/apache/seata/server/session/redis/RedisLuaTransactionStoreManagerTest.java
+++
b/server/src/test/java/org/apache/seata/server/session/redis/RedisLuaTransactionStoreManagerTest.java
@@ -23,6 +23,7 @@ import
org.apache.seata.server.storage.redis.session.RedisSessionManager;
import
org.apache.seata.server.storage.redis.store.RedisLuaTransactionStoreManager;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
@@ -31,6 +32,7 @@ import org.springframework.context.ApplicationContext;
*
*/
@SpringBootTest
+@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisLuaTransactionStoreManagerTest extends
RedisTransactionStoreManagerTest {
/**
diff --git
a/server/src/test/java/org/apache/seata/server/session/redis/RedisQueryConsolTest.java
b/server/src/test/java/org/apache/seata/server/session/redis/RedisQueryConsolTest.java
index 563f96f7e1..09088faed9 100644
---
a/server/src/test/java/org/apache/seata/server/session/redis/RedisQueryConsolTest.java
+++
b/server/src/test/java/org/apache/seata/server/session/redis/RedisQueryConsolTest.java
@@ -27,11 +27,13 @@ import
org.apache.seata.server.console.service.GlobalSessionService;
import org.apache.seata.server.console.vo.GlobalLockVO;
import org.apache.seata.server.console.vo.GlobalSessionVO;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
/**
*/
@SpringBootTest
+@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisQueryConsolTest {
/**
diff --git
a/server/src/test/java/org/apache/seata/server/session/redis/RedisSessionManagerTest.java
b/server/src/test/java/org/apache/seata/server/session/redis/RedisSessionManagerTest.java
index be9ebe0b8b..b83855f949 100644
---
a/server/src/test/java/org/apache/seata/server/session/redis/RedisSessionManagerTest.java
+++
b/server/src/test/java/org/apache/seata/server/session/redis/RedisSessionManagerTest.java
@@ -37,6 +37,7 @@ import
org.apache.seata.server.storage.redis.store.RedisTransactionStoreManager;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.test.context.SpringBootTest;
@@ -48,6 +49,7 @@ import static
org.apache.seata.common.DefaultValues.DEFAULT_TX_GROUP;
/**
*/
@SpringBootTest
+@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisSessionManagerTest {
private static final Logger LOGGER =
LoggerFactory.getLogger(RedisSessionManagerTest.class);
diff --git
a/server/src/test/java/org/apache/seata/server/session/redis/RedisTransactionStoreManagerTest.java
b/server/src/test/java/org/apache/seata/server/session/redis/RedisTransactionStoreManagerTest.java
index 7e13d1d0eb..802854526a 100644
---
a/server/src/test/java/org/apache/seata/server/session/redis/RedisTransactionStoreManagerTest.java
+++
b/server/src/test/java/org/apache/seata/server/session/redis/RedisTransactionStoreManagerTest.java
@@ -41,6 +41,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.test.context.SpringBootTest;
@@ -51,6 +52,7 @@ import static
org.apache.seata.server.storage.SessionConverter.convertToGlobalSe
/**
*/
@SpringBootTest
+@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisTransactionStoreManagerTest {
private static final Logger LOGGER =
LoggerFactory.getLogger(RedisTransactionStoreManagerTest.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
