This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 5701859f3 Fix failed test s(#1106)
5701859f3 is described below
commit 5701859f342c811e23cc3104e45e16c0a829be9c
Author: hqbfz <[email protected]>
AuthorDate: Thu Mar 21 14:26:09 2024 +0800
Fix failed test s(#1106)
---
2-advanced/dubbo-samples-autowire/case-configuration.yml | 9 +++++++++
.../dubbo/samples/autowire/consumer/AutowireServiceIT.java | 3 ++-
.../java/org/apache/dubbo/demo/consumer/DemoServiceConfigIT.java | 2 +-
.../test/java/org/apache/dubbo/demo/consumer/DemoServiceIT.java | 4 ----
.../main/java/org/apache/dubbo/demo/consumer/Application.java | 1 -
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/2-advanced/dubbo-samples-autowire/case-configuration.yml
b/2-advanced/dubbo-samples-autowire/case-configuration.yml
index 6a789280a..4e4a292fc 100644
--- a/2-advanced/dubbo-samples-autowire/case-configuration.yml
+++ b/2-advanced/dubbo-samples-autowire/case-configuration.yml
@@ -22,6 +22,14 @@ services:
type: app
basedir: dubbo-samples-autowire-provider
mainClass: org.apache.dubbo.samples.autowire.provider.ProviderBootstrap
+ systemProps:
+ - zookeeper.address=zookeeper
+ waitPortsBeforeRun:
+ - zookeeper:2181
+ checkPorts:
+ - 20880
+ depends_on:
+ - zookeeper
autowire-consumer:
type: test
@@ -38,3 +46,4 @@ services:
- autowire-provider:20880
depends_on:
- autowire-provider
+ - zookeeper
diff --git
a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/src/test/java/org/apache/dubbo/samples/autowire/consumer/AutowireServiceIT.java
b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/src/test/java/org/apache/dubbo/samples/autowire/consumer/AutowireServiceIT.java
index e67ac7a58..c93715305 100644
---
a/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/src/test/java/org/apache/dubbo/samples/autowire/consumer/AutowireServiceIT.java
+++
b/2-advanced/dubbo-samples-autowire/dubbo-samples-autowire-consumer/src/test/java/org/apache/dubbo/samples/autowire/consumer/AutowireServiceIT.java
@@ -19,13 +19,14 @@ package org.apache.dubbo.samples.autowire.consumer;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.samples.autowire.api.HelloService;
+import org.apache.dubbo.spring.boot.autoconfigure.DubboAutoConfiguration;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
-@SpringBootTest
+@SpringBootTest(classes = {DubboAutoConfiguration.class})
@RunWith(SpringRunner.class)
public class AutowireServiceIT {
diff --git
a/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceConfigIT.java
b/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceConfigIT.java
index bd518a0e7..c46a877f5 100644
---
a/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceConfigIT.java
+++
b/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceConfigIT.java
@@ -47,7 +47,7 @@ public class DemoServiceConfigIT {
RegistryConfig registryConfig = new RegistryConfig(applicationModel);
registryConfig.setProtocol("zookeeper");
- registryConfig.setAddress(System.getProperty("zookeeper.address",
"10.21.32.39"));
+ registryConfig.setAddress(System.getProperty("zookeeper.address",
"127.0.0.1"));
registryConfig.setPort(Integer.parseInt(System.getProperty("zookeeper.port",
"2181")));
applicationModel.getApplicationConfigManager().setApplication(applicationConfig);
diff --git
a/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceIT.java
b/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceIT.java
index b3c77913d..81c05bb50 100644
---
a/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceIT.java
+++
b/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceIT.java
@@ -72,11 +72,7 @@ public class DemoServiceIT {
checkIfNotified();
Assert.assertTrue(demoServiceFromNormal.sayHello("client").contains("registry-type:
normal"));
- try {
- demoServiceFromService.sayHello("client");
- } catch (RpcException ignore) {
- }
Assert.assertTrue(demoServiceFromDual.sayHello("client").contains("registry-type:
dual"));
}
diff --git
a/2-advanced/dubbo-samples-service-discovery/servicediscovery-transfer/servicediscovery-transfer-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
b/2-advanced/dubbo-samples-service-discovery/servicediscovery-transfer/servicediscovery-transfer-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
index 44b4e0f4c..f3faa7700 100644
---
a/2-advanced/dubbo-samples-service-discovery/servicediscovery-transfer/servicediscovery-transfer-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
+++
b/2-advanced/dubbo-samples-service-discovery/servicediscovery-transfer/servicediscovery-transfer-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
@@ -28,7 +28,6 @@ import
org.springframework.boot.autoconfigure.SpringBootApplication;
public class Application implements CommandLineRunner {
public static void main(String[] args) {
SpringApplication.run(Application.class,args);
- System.out.println("dubbo service started");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
