natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix uts on 3.2 (#13090)

This commit is contained in:
Albumen Kevin 2023-09-21 14:07:14 +08:00 committed by GitHub
parent 767eaa8ba7
commit 705d96e9f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 61 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.github/workflows/build-and-test-scheduled-3.2.yml vendored
View File

@ -134,7 +134,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ ubuntu-latest, windows-latest ] os: [ ubuntu-latest, windows-latest ]
jdk: [ 8, 11, 17, 19, 21 ] jdk: [ 8, 11, 17, 21 ]
env: env:
DISABLE_FILE_SYSTEM_TEST: true DISABLE_FILE_SYSTEM_TEST: true
steps: steps:
@ -142,8 +142,9 @@ jobs:
with: with:
ref: "3.2" ref: "3.2"
- name: "Set up JDK ${{ matrix.jdk }}" - name: "Set up JDK ${{ matrix.jdk }}"
uses: actions/setup-java@v1 uses: actions/setup-java@v3
with: with:
distribution: 'zulu'
java-version: ${{ matrix.jdk }} java-version: ${{ matrix.jdk }}
- uses: actions/cache@v3 - uses: actions/cache@v3
name: "Cache local Maven repository" name: "Cache local Maven repository"
@ -180,7 +181,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ ubuntu-latest, windows-latest ] os: [ ubuntu-latest, windows-latest ]
jdk: [ 8, 11, 17, 19, 21 ] jdk: [ 8, 11, 17, 21 ]
env: env:
DISABLE_FILE_SYSTEM_TEST: true DISABLE_FILE_SYSTEM_TEST: true
DUBBO_DEFAULT_SERIALIZATION: fastjson2 DUBBO_DEFAULT_SERIALIZATION: fastjson2
@ -190,8 +191,9 @@ jobs:
with: with:
ref: "3.2" ref: "3.2"
- name: "Set up JDK ${{ matrix.jdk }}" - name: "Set up JDK ${{ matrix.jdk }}"
uses: actions/setup-java@v1 uses: actions/setup-java@v3
with: with:
distribution: 'zulu'
java-version: ${{ matrix.jdk }} java-version: ${{ matrix.jdk }}
- uses: actions/cache@v3 - uses: actions/cache@v3
name: "Cache local Maven repository" name: "Cache local Maven repository"
@ -209,13 +211,21 @@ jobs:
key: zookeeper-${{ runner.os }}-${{ env.ZOOKEEPER_VERSION }} key: zookeeper-${{ runner.os }}-${{ env.ZOOKEEPER_VERSION }}
restore-keys: | restore-keys: |
zookeeper-${{ runner.os }}- zookeeper-${{ runner.os }}-
- name: "Test with Maven with Integration Tests on JDK 8"
timeout-minutes: 70
if: ${{ startsWith( matrix.os, 'ubuntu') && matrix.jdk == '8' }}
run: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Pjacoco,'!jdk15ge' -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper
- name: "Test with Maven without Integration Tests on JDK 8"
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'" -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: "Test with Maven with Integration Tests" - name: "Test with Maven with Integration Tests"
timeout-minutes: 70 timeout-minutes: 70
if: ${{ startsWith( matrix.os, 'ubuntu') }} if: ${{ startsWith( matrix.os, 'ubuntu') && matrix.jdk != '8' }}
run: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Pjacoco,jdk15ge-simple,'!jdk15ge' -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper run: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Pjacoco,jdk15ge-simple,'!jdk15ge' -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper
- name: "Test with Maven without Integration Tests" - name: "Test with Maven without Integration Tests"
timeout-minutes: 90 timeout-minutes: 90
if: ${{ startsWith( matrix.os, 'windows') }} 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.workspace }}/.tmp/zookeeper" 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.workspace }}/.tmp/zookeeper"
- name: "Upload coverage to Codecov" - name: "Upload coverage to Codecov"
uses: codecov/codecov-action@v3 uses: codecov/codecov-action@v3
@ -249,7 +259,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
jdk: [ 8, 11, 17, 19, 21 ] jdk: [ 8, 11, 17, 21 ]
job_id: [1, 2, 3, 4, 5] job_id: [1, 2, 3, 4, 5]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -278,8 +288,9 @@ jobs:
name: test-list name: test-list
path: test/jobs/ path: test/jobs/
- name: "Set up JDK ${{matrix.jdk}}" - name: "Set up JDK ${{matrix.jdk}}"
uses: actions/setup-java@v1 uses: actions/setup-java@v3
with: with:
distribution: 'zulu'
java-version: ${{matrix.jdk}} java-version: ${{matrix.jdk}}
- name: "Init Candidate Versions" - name: "Init Candidate Versions"
run: | run: |
@ -306,7 +317,7 @@ jobs:
JAVA_VER: ${{matrix.jdk}} JAVA_VER: ${{matrix.jdk}}
strategy: strategy:
matrix: matrix:
jdk: [ 8, 11, 17, 19, 21 ] jdk: [ 8, 11, 17, 21 ]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -335,8 +346,9 @@ jobs:
path: "./dubbo-test-tools" path: "./dubbo-test-tools"
- name: "Set up JDK 17" - name: "Set up JDK 17"
uses: actions/setup-java@v1 uses: actions/setup-java@v3
with: with:
distribution: 'zulu'
java-version: 17 java-version: 17
- name: "Compile Dubbo (Linux)" - name: "Compile Dubbo (Linux)"

45
.github/workflows/release-test.yml vendored
View File

@ -64,7 +64,7 @@ jobs:
run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r
- name: "Upload checkstyle file if failure" - name: "Upload checkstyle file if failure"
if: failure() if: failure()
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: "checkstyle-file" name: "checkstyle-file"
path: ${{ github.workspace }}/checkstyle.zip path: ${{ github.workspace }}/checkstyle.zip
@ -132,7 +132,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ ubuntu-latest, windows-latest ] os: [ ubuntu-latest, windows-latest ]
jdk: [ 8, 11, 17, 19 ] jdk: [ 8, 11, 17, 21 ]
env: env:
DISABLE_FILE_SYSTEM_TEST: true DISABLE_FILE_SYSTEM_TEST: true
steps: steps:
@ -150,6 +150,14 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
${{ runner.os }}-maven- ${{ runner.os }}-maven-
- uses: actions/cache@v3
name: "Cache zookeeper binary archive"
id: "cache-zookeeper"
with:
path: ${{ github.workspace }}/.tmp/zookeeper
key: zookeeper-${{ runner.os }}-${{ env.ZOOKEEPER_VERSION }}
restore-keys: |
zookeeper-${{ runner.os }}-
- name: "Test with Maven with Integration Tests" - name: "Test with Maven with Integration Tests"
timeout-minutes: 70 timeout-minutes: 70
if: ${{ startsWith( matrix.os, 'ubuntu') }} if: ${{ startsWith( matrix.os, 'ubuntu') }}
@ -169,7 +177,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ ubuntu-latest, windows-latest ] os: [ ubuntu-latest, windows-latest ]
jdk: [ 8, 11, 17, 19 ] jdk: [ 8, 11, 17, 21 ]
env: env:
DISABLE_FILE_SYSTEM_TEST: true DISABLE_FILE_SYSTEM_TEST: true
DUBBO_DEFAULT_SERIALIZATION: fastjson2 DUBBO_DEFAULT_SERIALIZATION: fastjson2
@ -189,14 +197,30 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
${{ runner.os }}-maven- ${{ runner.os }}-maven-
- uses: actions/cache@v3
name: "Cache zookeeper binary archive"
id: "cache-zookeeper"
with:
path: ${{ github.workspace }}/.tmp/zookeeper
key: zookeeper-${{ runner.os }}-${{ env.ZOOKEEPER_VERSION }}
restore-keys: |
zookeeper-${{ runner.os }}-
- name: "Test with Maven with Integration Tests on JDK 8"
timeout-minutes: 70
if: ${{ startsWith( matrix.os, 'ubuntu') && matrix.jdk == '8' }}
run: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Pjacoco,'!jdk15ge' -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper
- name: "Test with Maven without Integration Tests on JDK 8"
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'" -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: "Test with Maven with Integration Tests" - name: "Test with Maven with Integration Tests"
timeout-minutes: 70 timeout-minutes: 70
if: ${{ startsWith( matrix.os, 'ubuntu') }} if: ${{ startsWith( matrix.os, 'ubuntu') && matrix.jdk != '8' }}
run: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Pjacoco -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper run: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Pjacoco,jdk15ge-simple,'!jdk15ge' -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper
- name: "Test with Maven without Integration Tests" - name: "Test with Maven without Integration Tests"
timeout-minutes: 90 timeout-minutes: 90
if: ${{ startsWith( matrix.os, 'windows') }} if: ${{ startsWith( matrix.os, 'windows') && matrix.jdk != '8' }}
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" 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.workspace }}/.tmp/zookeeper"
- name: "Upload coverage to Codecov" - name: "Upload coverage to Codecov"
uses: codecov/codecov-action@v3 uses: codecov/codecov-action@v3
@ -229,7 +253,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
jdk: [ 8, 11, 17, 19 ] jdk: [ 8, 11, 17, 21 ]
job_id: [1, 2, 3, 4, 5] job_id: [1, 2, 3, 4, 5]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -286,7 +310,7 @@ jobs:
JAVA_VER: ${{matrix.jdk}} JAVA_VER: ${{matrix.jdk}}
strategy: strategy:
matrix: matrix:
jdk: [ 8, 11, 17, 19 ] jdk: [ 8, 11, 17, 21 ]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -333,7 +357,7 @@ jobs:
- name: "Upload error code inspection result" - name: "Upload error code inspection result"
# always() should not be used here, since we don't need to handle the 'canceled' situation. # always() should not be used here, since we don't need to handle the 'canceled' situation.
if: ${{ success() || failure() }} if: ${{ success() || failure() }}
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: "error-inspection-result" name: "error-inspection-result"
path: ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector/error-inspection-result.txt path: ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector/error-inspection-result.txt
@ -343,6 +367,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
ref: "3.2"
path: "./dubbo" path: "./dubbo"
- name: "Setup GraalVM environment" - name: "Setup GraalVM environment"

2
dubbo-config/dubbo-config-spring/src/test/resources/META-INF/isolation/dubbo-consumer.xml
View File

@ -26,7 +26,7 @@
<dubbo:metadata-report address="zookeeper://127.0.0.1:2181"/> <dubbo:metadata-report address="zookeeper://127.0.0.1:2181"/>
<dubbo:registry id="demo1" address="zookeeper://127.0.0.1:2181?registry-type=service"/> <dubbo:registry id="demo1" address="zookeeper://127.0.0.1:2181"/>
<!-- refer with dubbo protocol--> <!-- refer with dubbo protocol-->
<dubbo:reference version="1.0.0" group="Group1" id="dubbo-demoServiceV1" check="false" scope="remote" <dubbo:reference version="1.0.0" group="Group1" id="dubbo-demoServiceV1" check="false" scope="remote"

5
dubbo-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/aggregate/SlidingWindowTest.java
View File

@ -18,6 +18,7 @@
package org.apache.dubbo.metrics.aggregate; package org.apache.dubbo.metrics.aggregate;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.RepeatedTest;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.concurrent.atomic.LongAdder; import java.util.concurrent.atomic.LongAdder;
@ -40,7 +41,7 @@ class SlidingWindowTest {
window = new TestSlidingWindow(paneCount, intervalInMs); window = new TestSlidingWindow(paneCount, intervalInMs);
} }
@Test @RepeatedTest(1000)
void testCurrentPane() { void testCurrentPane() {
assertNull(window.currentPane(/* invalid time*/-1L)); assertNull(window.currentPane(/* invalid time*/-1L));
long timeInMs = System.currentTimeMillis(); long timeInMs = System.currentTimeMillis();
@ -48,7 +49,7 @@ class SlidingWindowTest {
assertNotNull(currentPane); assertNotNull(currentPane);
// reuse test // reuse test
assertEquals(currentPane, assertEquals(currentPane,
window.currentPane(1 + timeInMs + window.getPaneIntervalInMs() * paneCount)); window.currentPane(timeInMs + window.getPaneIntervalInMs() * paneCount));
} }
@Test @Test