[SCB-1957]modify test case configuration

apache · Jun 3, 2020 · 22476f8 · 22476f8
1 parent 18a50b7
commit 22476f8
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 22 deletions.
diff --git a/integration-tests/jaxrs-tests/src/test/resources/microservice.yaml b/integration-tests/jaxrs-tests/src/test/resources/microservice.yaml
@@ -23,8 +23,7 @@ servicecomb:
   service:
     registry:
       address: http://127.0.0.1:30100
-      registration.enabled: false
-      discovery.enabled: false
+      enabled: false
   rest:
     address: 0.0.0.0:8080
   handler:

diff --git a/integration-tests/pojo-test/src/test/resources/microservice.yaml b/integration-tests/pojo-test/src/test/resources/microservice.yaml
@@ -22,7 +22,6 @@ service_description:
 servicecomb:
   service:
     registry:
-      registration.enabled: false
-      discovery.enabled: false
+      enabled: false
   rest:
     address: 0.0.0.0:7070
diff --git a/integration-tests/spring-jaxrs-tests/src/test/resources/microservice.yaml b/integration-tests/spring-jaxrs-tests/src/test/resources/microservice.yaml
@@ -22,5 +22,4 @@ property:
 servicecomb:
   service:
     registry:
-      registration.enabled: false
-      discovery.enabled: false
+      enabled: false
diff --git a/integration-tests/spring-pojo-connection-limit-test/src/test/resources/microservice.yaml b/integration-tests/spring-pojo-connection-limit-test/src/test/resources/microservice.yaml
@@ -22,8 +22,7 @@ service_description:
 servicecomb:
   service:
     registry:
-      registration.enabled: false
-      discovery.enabled: false
+      enabled: false
   rest:
     address: 0.0.0.0:7070
     server:

diff --git a/integration-tests/spring-pojo-tests/src/test/resources/microservice.yaml b/integration-tests/spring-pojo-tests/src/test/resources/microservice.yaml
@@ -18,5 +18,4 @@
 servicecomb:
   service:
     registry:
-      registration.enabled: false
-      discovery.enabled: false
+      enabled: false
diff --git a/integration-tests/springmvc-tests/connection-limit/src/test/resources/microservice.yaml b/integration-tests/springmvc-tests/connection-limit/src/test/resources/microservice.yaml
@@ -22,8 +22,7 @@ service_description:
 servicecomb:
   service:
     registry:
-      registration.enabled: false
-      discovery.enabled: false
+      enabled: false
   rest:
     address: 0.0.0.0:8080
     server:

diff --git a/...ration-tests/springmvc-tests/general-with-springboot/src/test/resources/microservice.yaml b/...ration-tests/springmvc-tests/general-with-springboot/src/test/resources/microservice.yaml
@@ -23,8 +23,7 @@ servicecomb:
   service:
     registry:
       address: http://127.0.0.1:30100
-      registration.enabled: false
-      discovery.enabled: false
+      enabled: false
   rest:
     address: 0.0.0.0:8080
   handler:

diff --git a/integration-tests/springmvc-tests/general/src/test/resources/microservice.yaml b/integration-tests/springmvc-tests/general/src/test/resources/microservice.yaml
@@ -23,8 +23,7 @@ servicecomb:
   service:
     registry:
       address: http://127.0.0.1:30100
-      registration.enabled: false
-      discovery.enabled: false
+      enabled: false
   rest:
     address: 0.0.0.0:8080
   handler:

diff --git a/...s/springmvc-tests/simplified-mapping-with-springboot/src/test/resources/microservice.yaml b/...s/springmvc-tests/simplified-mapping-with-springboot/src/test/resources/microservice.yaml
@@ -23,8 +23,7 @@ servicecomb:
   service:
     registry:
       address: http://127.0.0.1:30100
-      registration.enabled: false
-      discovery.enabled: false
+      enabled: false
   rest:
     address: 0.0.0.0:8080
   handler:

diff --git a/integration-tests/springmvc-tests/simplified-mapping/src/test/resources/microservice.yaml b/integration-tests/springmvc-tests/simplified-mapping/src/test/resources/microservice.yaml
@@ -23,8 +23,7 @@ servicecomb:
   service:
     registry:
       address: http://127.0.0.1:30100
-      registration.enabled: false
-      discovery.enabled: false
+      enabled: false
   rest:
     address: 0.0.0.0:8080
   handler:

diff --git a/integration-tests/tracing-tests/src/test/resources/microservice.yaml b/integration-tests/tracing-tests/src/test/resources/microservice.yaml
@@ -22,8 +22,7 @@ service_description:
 servicecomb:
   service:
     registry:
-      registration.enabled: false
-      discovery.enabled: false
+      enabled: false
   rest:
     address: 0.0.0.0:8080?sslEnabled=false
   highway: