This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 32eefbc13e58fa4990a017a16492f2c3c77786f2 Author: liubao <bao....@huawei.com> AuthorDate: Sat Aug 25 09:15:51 2018 +0800 [SBC-870]remove not correct test. --- .../apache/servicecomb/demo/pojo/client/PojoClient.java | 15 +-------------- .../pojo-server/src/main/resources/microservice.yaml | 4 ++-- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java b/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java index 3b55ebb..ccb01ca 100644 --- a/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java +++ b/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java @@ -111,24 +111,11 @@ public class PojoClient { testNull(testFromXml); testNull(test); testEmpty(test); + // This test case shows destroy of WeightedResponseTimeRule timer task. after test finished will not print: // "Weight adjusting job started" and thread "NFLoadBalancer-serverWeightTimer-unknown" destroyed. ArchaiusUtils.setProperty("servicecomb.loadbalance.strategy.name", "WeightedResponse"); testStringArray(test); - boolean checkerStated = false; - // Timer may not start thread very fast so check for 3 times. - for (int i = 0; i < 3; i++) { - Set<Thread> allThreads = Thread.getAllStackTraces().keySet(); - for (Thread t : allThreads) { - if (t.getName().equals("NFLoadBalancer-serverWeightTimer-unknown")) { - checkerStated = true; - break; - } - } - Thread.sleep(1000); - } - TestMgr.check(checkerStated, true); - ArchaiusUtils.setProperty("servicecomb.loadbalance.strategy.name", "RoundRobin"); testStringArray(test); diff --git a/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml b/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml index e705183..77e9502 100644 --- a/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml +++ b/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml @@ -24,9 +24,9 @@ servicecomb: registry: address: http://127.0.0.1:30100 rest: - address: 0.0.0.0:8080?protocol=http2 + address: 0.0.0.0:8086?protocol=http2 highway: - address: 0.0.0.0:7070 + address: 0.0.0.0:7076 #executors: #default: test #Provider: