This is an automated email from the ASF dual-hosted git repository.
rainyu pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new 1d4e26fa13 Stabilizing context-related tests in dubbo-config-spring
(#15835)
1d4e26fa13 is described below
commit 1d4e26fa1381adee0917682d74668ec7e1fecef1
Author: Anshul Bisht <[email protected]>
AuthorDate: Thu Jan 15 06:36:55 2026 -0600
Stabilizing context-related tests in dubbo-config-spring (#15835)
---
.../config/spring/context/KeepRunningOnSpringClosedTest.java | 9 +++++++++
.../context/annotation/DubboComponentScanRegistrarTest.java | 9 ++++++++-
.../dubbo/config/spring/context/annotation/EnableDubboTest.java | 5 +++++
.../spring/context/customize/DubboSpringInitCustomizerTest.java | 3 +++
4 files changed, 25 insertions(+), 1 deletion(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/KeepRunningOnSpringClosedTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/KeepRunningOnSpringClosedTest.java
index afcf4140e4..9f5f3d07b0 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/KeepRunningOnSpringClosedTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/KeepRunningOnSpringClosedTest.java
@@ -25,11 +25,20 @@ import org.apache.dubbo.config.spring.SysProps;
import org.apache.dubbo.rpc.model.ModuleModel;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
class KeepRunningOnSpringClosedTest {
+ @BeforeEach
+ void setUp() {
+ DubboBootstrap.reset();
+ SysProps.clear();
+ SysProps.setProperty("dubbo.metrics.enabled", "false");
+ SysProps.setProperty("dubbo.metrics.protocol", "disabled");
+ }
+
@Test
void test() {
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
index 5f5d4ac3aa..4aa042a0bf 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.config.spring.context.annotation;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
+import org.apache.dubbo.config.spring.SysProps;
import org.apache.dubbo.config.spring.api.DemoService;
import
org.apache.dubbo.config.spring.context.annotation.consumer.ConsumerConfiguration;
import
org.apache.dubbo.config.spring.context.annotation.provider.DemoServiceImpl;
@@ -42,10 +43,16 @@ class DubboComponentScanRegistrarTest {
@BeforeEach
public void setUp() {
DubboBootstrap.reset();
+ SysProps.clear();
+ SysProps.setProperty("dubbo.metrics.enabled", "false");
+ SysProps.setProperty("dubbo.metrics.protocol", "disabled");
}
@AfterEach
- public void tearDown() {}
+ public void tearDown() {
+ DubboBootstrap.reset();
+ SysProps.clear();
+ }
@Test
void test() {
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboTest.java
index b171a6cf0c..43db1cb094 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboTest.java
@@ -18,6 +18,7 @@ package org.apache.dubbo.config.spring.context.annotation;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
+import org.apache.dubbo.config.spring.SysProps;
import org.apache.dubbo.config.spring.api.DemoService;
import
org.apache.dubbo.config.spring.beans.factory.annotation.ServiceAnnotationTestConfiguration;
import
org.apache.dubbo.config.spring.context.annotation.consumer.test.TestConsumerConfiguration;
@@ -56,12 +57,16 @@ class EnableDubboTest {
public void setUp() {
context = new AnnotationConfigApplicationContext();
DubboBootstrap.reset();
+ SysProps.clear();
+ SysProps.setProperty("dubbo.metrics.enabled", "false");
+ SysProps.setProperty("dubbo.metrics.protocol", "disabled");
}
@AfterEach
public void tearDown() {
context.close();
DubboBootstrap.reset();
+ SysProps.clear();
}
@Test
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/customize/DubboSpringInitCustomizerTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/customize/DubboSpringInitCustomizerTest.java
index b2810064fa..d9260a365e 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/customize/DubboSpringInitCustomizerTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/customize/DubboSpringInitCustomizerTest.java
@@ -37,6 +37,9 @@ class DubboSpringInitCustomizerTest {
@BeforeAll
public static void beforeAll() {
DubboBootstrap.reset();
+ SysProps.clear();
+ SysProps.setProperty("dubbo.metrics.enabled", "false");
+ SysProps.setProperty("dubbo.metrics.protocol", "disabled");
SysProps.setProperty("dubbo.registry.address",
ZookeeperRegistryCenterConfig.getConnectionAddress());
}
