This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new 0fb1e4c4c6 Enhance unit test cases from scheduled tasks (#13099)
0fb1e4c4c6 is described below
commit 0fb1e4c4c644390d76398f223528de5dace9c440
Author: Albumen Kevin <[email protected]>
AuthorDate: Fri Sep 22 20:23:32 2023 +0800
Enhance unit test cases from scheduled tasks (#13099)
---
.github/workflows/build-and-test-pr.yml | 2 ++
.github/workflows/build-and-test-scheduled-3.1.yml | 4 ----
.github/workflows/build-and-test-scheduled-3.2.yml | 4 ----
.github/workflows/release-test.yml | 4 ----
.../dubbo/remoting/transport/netty4/NettyClientToServerTest.java | 2 +-
.../test/java/org/apache/dubbo/rpc/filter/ActiveLimitFilterTest.java | 2 +-
6 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/build-and-test-pr.yml
b/.github/workflows/build-and-test-pr.yml
index 80415789b0..02780943d3 100644
--- a/.github/workflows/build-and-test-pr.yml
+++ b/.github/workflows/build-and-test-pr.yml
@@ -358,6 +358,8 @@ jobs:
path: dubbo/
- name: "Upload coverage to Codecov"
uses: codecov/codecov-action@v3
+ with:
+ verbose: true
error-code-inspecting:
runs-on: ubuntu-latest
diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml
b/.github/workflows/build-and-test-scheduled-3.1.yml
index 8d56ddc30b..887149ea57 100644
--- a/.github/workflows/build-and-test-scheduled-3.1.yml
+++ b/.github/workflows/build-and-test-scheduled-3.1.yml
@@ -169,8 +169,6 @@ jobs:
timeout-minutes: 90
if: ${{ startsWith( matrix.os, 'windows') }}
run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify -Pjacoco
-D"http.keepAlive=false" -D"maven.wagon.http.pool=false"
-D"maven.wagon.httpconnectionManager.ttlSeconds=120"
-D"maven.wagon.http.retryHandler.count=5" -DskipTests=false
-DskipIntegrationTests=true -D"checkstyle.skip=false"
-D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"
-D"embeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper"
- - name: "Upload coverage to Codecov"
- uses: codecov/codecov-action@v3
unit-test-fastjson2:
needs: [build-source, unit-test-prepare]
@@ -217,8 +215,6 @@ jobs:
timeout-minutes: 90
if: ${{ startsWith( matrix.os, 'windows') }}
run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify -Pjacoco
-D"http.keepAlive=false" -D"maven.wagon.http.pool=false"
-D"maven.wagon.httpconnectionManager.ttlSeconds=120"
-D"maven.wagon.http.retryHandler.count=5" -DskipTests=false
-DskipIntegrationTests=true -D"checkstyle.skip=false"
-D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"
-D"embeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper"
- - name: "Upload coverage to Codecov"
- uses: codecov/codecov-action@v3
integration-test-prepare:
runs-on: ubuntu-latest
diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml
b/.github/workflows/build-and-test-scheduled-3.2.yml
index 2381e2289b..78c3e020c1 100644
--- a/.github/workflows/build-and-test-scheduled-3.2.yml
+++ b/.github/workflows/build-and-test-scheduled-3.2.yml
@@ -170,8 +170,6 @@ jobs:
timeout-minutes: 90
if: ${{ startsWith( matrix.os, 'windows') }}
run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify -Pjacoco
-D"http.keepAlive=false" -D"maven.wagon.http.pool=false"
-D"maven.wagon.httpconnectionManager.ttlSeconds=120"
-D"maven.wagon.http.retryHandler.count=5" -DskipTests=false
-DskipIntegrationTests=true -D"checkstyle.skip=false"
-D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"
-D"embeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper"
- - name: "Upload coverage to Codecov"
- uses: codecov/codecov-action@v3
unit-test-fastjson2:
needs: [build-source, unit-test-prepare]
@@ -227,8 +225,6 @@ jobs:
timeout-minutes: 90
if: ${{ startsWith( matrix.os, 'windows') && matrix.jdk != '8' }}
run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify
-P"jacoco,jdk15ge-simple,'!jdk15ge'" -D"http.keepAlive=false"
-D"maven.wagon.http.pool=false"
-D"maven.wagon.httpconnectionManager.ttlSeconds=120"
-D"maven.wagon.http.retryHandler.count=5" -DskipTests=false
-DskipIntegrationTests=true -D"checkstyle.skip=false"
-D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"
-D"embeddedZookeeperPath=${{ github.workspa [...]
- - name: "Upload coverage to Codecov"
- uses: codecov/codecov-action@v3
integration-test-prepare:
runs-on: ubuntu-latest
diff --git a/.github/workflows/release-test.yml
b/.github/workflows/release-test.yml
index 431b909cf5..f8c59ea959 100644
--- a/.github/workflows/release-test.yml
+++ b/.github/workflows/release-test.yml
@@ -166,8 +166,6 @@ jobs:
timeout-minutes: 90
if: ${{ startsWith( matrix.os, 'windows') }}
run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify -Pjacoco
-D"http.keepAlive=false" -D"maven.wagon.http.pool=false"
-D"maven.wagon.httpconnectionManager.ttlSeconds=120"
-D"maven.wagon.http.retryHandler.count=5" -DskipTests=false
-DskipIntegrationTests=true -D"checkstyle.skip=false"
-D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"
-D"embeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper"
- - name: "Upload coverage to Codecov"
- uses: codecov/codecov-action@v3
unit-test-fastjson2:
needs: [build-source, unit-test-prepare]
@@ -221,8 +219,6 @@ jobs:
timeout-minutes: 90
if: ${{ startsWith( matrix.os, 'windows') && matrix.jdk != '8' }}
run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify
-P"jacoco,jdk15ge-simple,'!jdk15ge'" -D"http.keepAlive=false"
-D"maven.wagon.http.pool=false"
-D"maven.wagon.httpconnectionManager.ttlSeconds=120"
-D"maven.wagon.http.retryHandler.count=5" -DskipTests=false
-DskipIntegrationTests=true -D"checkstyle.skip=false"
-D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"
-D"embeddedZookeeperPath=${{ github.workspa [...]
- - name: "Upload coverage to Codecov"
- uses: codecov/codecov-action@v3
integration-test-prepare:
runs-on: ubuntu-latest
diff --git
a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyClientToServerTest.java
b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyClientToServerTest.java
index 2f0f6e03fb..4b66d3faea 100644
---
a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyClientToServerTest.java
+++
b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyClientToServerTest.java
@@ -58,7 +58,7 @@ class NettyClientToServerTest extends ClientToServerTest {
protected ExchangeChannel newClient(int port) throws RemotingException {
// add heartbeat cycle to avoid unstable ut.
- URL url = URL.valueOf("exchange://localhost:" + port +
"?client=netty4&timeout=3000");
+ URL url = URL.valueOf("exchange://localhost:" + port +
"?client=netty4&timeout=300000");
url = url.addParameter(Constants.HEARTBEAT_KEY, 600 * 1000);
ApplicationModel applicationModel = ApplicationModel.defaultModel();
ApplicationConfig applicationConfig = new
ApplicationConfig("provider-app");
diff --git
a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ActiveLimitFilterTest.java
b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ActiveLimitFilterTest.java
index 24ee75905a..a2c4ddf5a7 100644
---
a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ActiveLimitFilterTest.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ActiveLimitFilterTest.java
@@ -150,7 +150,7 @@ class ActiveLimitFilterTest {
void testInvokeNotTimeOut() {
int totalThread = 100;
int maxActives = 10;
- long timeout = 1000;
+ long timeout = 100000;
long blockTime = 0;
AtomicInteger count = new AtomicInteger(0);
final CountDownLatch latch = new CountDownLatch(1);
