Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test : fix mock-server test, do not shutdown in Runtime.getRuntime().addShutdownHook #6560

Merged
merged 2 commits into from
May 20, 2024
Merged

test : fix mock-server test, do not shutdown in Runtime.getRuntime().addShutdownHook #6560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7815078
fix mock shutdown
Bughue May 20, 2024
92f7245
fix mock shutdown
Bughue May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/en-us/2.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6466](https://github.com/apache/incubator-seata/pull/6466)] support redis integration testing
- [[#6484](https://github.com/apache/incubator-seata/pull/6484)] fix FileConfigurationTest and MockServerTest fail
- [[#6545](https://github.com/apache/incubator-seata/pull/6545)] fix TestConfigCustomSPI compatibility test fail
- [[#6560](https://github.com/apache/incubator-seata/pull/6560)] fix mock-server test, do not shutdown in Runtime.getRuntime().addShutdownHook

### refactor:
- [[#6280](https://github.com/apache/incubator-seata/pull/6280)] refactor Saga designer using diagram-js
Expand Down
1 change: 1 addition & 0 deletions changes/zh-cn/2.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@
- [[#6466](https://github.com/apache/incubator-seata/pull/6466)] 支持redis的集成测试
- [[#6484](https://github.com/apache/incubator-seata/pull/6484)] 修复FileConfigurationTest和MockServerTest失败
- [[#6545](https://github.com/apache/incubator-seata/pull/6545)] 修复 TestConfigCustomSPI 兼容性测试失败
- [[#6560](https://github.com/apache/incubator-seata/pull/6560)] 修复 mockserver test，不在 Runtime.getRuntime().addShutdownHook 中关闭

### refactor:
- [[#6280](https://github.com/apache/incubator-seata/pull/6280)] 使用diagram-js重构Saga设计器
Expand Down
2 changes: 1 addition & 1 deletion test-mock-server/src/main/java/org/apache/seata/mockserver/MockServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public static void start(int port) {
Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
@Override
public void run() {
close();
LOGGER.info("system is closing , pid info: " + ManagementFactory.getRuntimeMXBean().getName());
}
}));
LOGGER.info("pid info: " + ManagementFactory.getRuntimeMXBean().getName());
Expand Down
2 changes: 1 addition & 1 deletion test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/ProtocolTestConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* Mock Constants
**/
public class ProtocolTestConstants {
public static final String APPLICATION_ID = "my_app_test";
public static final String APPLICATION_ID = "mock_tx_app_id";
public static final String SERVICE_GROUP = "mock_tx_group";
public static final int MOCK_SERVER_PORT = 8099;
public static final String MOCK_SERVER_ADDRESS = "0.0.0.0:" + MOCK_SERVER_PORT;
Expand Down
Loading