Skip to content

Commit

Permalink
Fix failed tests (apache#1102)
Browse files Browse the repository at this point in the history
  • Loading branch information
chickenlj authored Mar 20, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 834be87 commit b53e33b
Showing 11 changed files with 97 additions and 334 deletions.
2 changes: 1 addition & 1 deletion 2-advanced/dubbo-samples-autowire/case-configuration.yml
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ services:
tests:
- "**/*IT.class"
systemProps:
- zookeeper.address=autowire-provider
- zookeeper.address=zookeeper
- zookeeper.port=2181
- dubbo.address=autowire-provider
- dubbo.port=20880
35 changes: 30 additions & 5 deletions 2-advanced/dubbo-samples-direct/case-configuration.yml
Original file line number Diff line number Diff line change
@@ -14,9 +14,34 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from: app-external-zookeeper.yml
services:
zookeeper:
image: zookeeper:latest

props:
project_name: dubbo-samples-direct
main_class: org.apache.dubbo.samples.direct.ProviderApplication
dubbo_port: 20880
direct-provider:
type: app
basedir: dubbo-samples-direct-provider
mainClass: org.apache.dubbo.samples.direct.ProviderApplication
systemProps:
- zookeeper.address=zookeeper
waitPortsBeforeRun:
- zookeeper:2181
checkPorts:
- 20880
checkLog: "dubbo service started"

direct-consumer:
type: test
basedir: dubbo-samples-direct-consumer
tests:
- "**/*IT.class"
systemProps:
- zookeeper.address=zookeeper
- zookeeper.port=2181
- dubbo.address=direct-provider
- dubbo.port=20880
waitPortsBeforeRun:
- zookeeper:2181
- direct-provider:20880
depends_on:
- direct-provider
Original file line number Diff line number Diff line change
@@ -27,5 +27,6 @@
public class ProviderApplication {
public static void main(String[] args) {
SpringApplication.run(ProviderApplication.class);
System.out.println("dubbo service started");
}
}
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ services:
waitPortsBeforeRun:
- zookeeper:2181
checkPorts:
- 20880
- 50052
checkLog: "dubbo service started"

test:
@@ -39,7 +39,7 @@ services:
- zookeeper.address=zookeeper
waitPortsBeforeRun:
- zookeeper:2181
- provider:20880
- provider:50052
depends_on:
- provider

35 changes: 29 additions & 6 deletions 2-advanced/dubbo-samples-mock/case-configuration.yml
Original file line number Diff line number Diff line change
@@ -14,11 +14,34 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from: app-builtin-zookeeper.yml
services:
zookeeper:
image: zookeeper:latest

props:
project_name: dubbo-samples-mock
main_class: org.apache.dubbo.samples.mock.MockProvider
zookeeper_port: 2181
dubbo_port: 20880
provider:
type: app
basedir: dubbo-samples-mock-provider
mainClass: org.apache.dubbo.samples.mock.provider.ProviderApplication
systemProps:
- zookeeper.address=zookeeper
waitPortsBeforeRun:
- zookeeper:2181
checkPorts:
- 50052
checkLog: "dubbo service started"

direct-consumer:
type: test
basedir: dubbo-samples-mock-consumer
tests:
- "**/*IT.class"
systemProps:
- zookeeper.address=zookeeper
- zookeeper.port=2181
- dubbo.address=provider
- dubbo.port=50052
waitPortsBeforeRun:
- zookeeper:2181
- provider:50052
depends_on:
- provider
Original file line number Diff line number Diff line change
@@ -27,5 +27,6 @@
public class ProviderApplication {
public static void main(String[] args) {
SpringApplication.run(ProviderApplication.class, args);
System.out.println("dubbo service started");
}
}
2 changes: 1 addition & 1 deletion 2-advanced/dubbo-samples-seata/case-configuration.yml
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ services:
image: mysql:5.7
environment:
- MYSQL_DATABASE=seata
- MYSQL_ROOT_PASSWORD=helloworld
- MYSQL_ROOT_PASSWORD=root
volumes:
- ${_basedir}/script/db:/docker-entrypoint-initdb.d
seata-server:
Original file line number Diff line number Diff line change
@@ -14,11 +14,34 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from: app-builtin-zookeeper.yml
services:
zookeeper:
image: zookeeper:latest

props:
project_name: dubbo-samples-configcenter-annotation
main_class: org.apache.dubbo.samples.configcenter.annotation.AnnotationProvider
zookeeper_port: 2181
dubbo_port: 20990
configcenter-provider:
type: app
basedir: dubbo-samples-configcenter-annotation-provider
mainClass: org.apache.dubbo.samples.configcenter.annotation.ProviderApplication
systemProps:
- zookeeper.address=zookeeper
waitPortsBeforeRun:
- zookeeper:2181
checkPorts:
- 20990
checkLog: "dubbo service started"

configcenter-consumer:
type: test
basedir: dubbo-samples-configcenter-annotation-consumer
tests:
- "**/*IT.class"
systemProps:
- zookeeper.address=zookeeper
- zookeeper.port=2181
- dubbo.address=configcenter-provider
- dubbo.port=20990
waitPortsBeforeRun:
- zookeeper:2181
- configcenter-provider:20990
depends_on:
- configcenter-provider
Loading

0 comments on commit b53e33b

Please sign in to comment.