[servicecomb-pack] branch master updated: SCB-1203 Trying to fix the test error of TccLoadBalanceSenderTest

[ningjiang]

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git


The following commit(s) were added to refs/heads/master by this push:
     new 321c2e8  SCB-1203 Trying to fix the test error of 
TccLoadBalanceSenderTest
321c2e8 is described below

commit 321c2e8c5ec8c87a13e8bad7b85651edf0497638
Author: Willem Jiang <jiangni...@huawei.com>
AuthorDate: Sat Mar 16 10:25:20 2019 +0800

    SCB-1203 Trying to fix the test error of TccLoadBalanceSenderTest
---
 .../omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
 
b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
index 03d9d87..73ea4d9 100644
--- 
a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
+++ 
b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
@@ -83,7 +83,7 @@ public class TccLoadBalanceSenderTest extends 
LoadBalanceSenderTestBase {
   private final String parentTxId = uniquify("parentTxId");
   private final String methodName = uniquify("methodName");
   private final String confirmMethod = uniquify("confirmMethod");
-  private final String cancelMethod = uniquify("cancleMethod");
+  private final String cancelMethod = uniquify("canceMethod");
   private final String serviceName = uniquify("serviceName");
 
   private final ServiceConfig serviceConfig = new ServiceConfig(serviceName);
@@ -170,12 +170,12 @@ public class TccLoadBalanceSenderTest extends 
LoadBalanceSenderTestBase {
     Integer expectPort = Integer.valueOf(expectSender.target().split(":")[1]);
     GrpcParticipationStartedEvent result = (GrpcParticipationStartedEvent) 
eventsMap.get(expectPort).poll();
     assertThat(result.getGlobalTxId(), is(globalTxId));
-//    assertThat(result.getCancelMethod(), is(cancelMethod));
-//    assertThat(result.getConfirmMethod(), is(confirmMethod));
+    assertThat(result.getCancelMethod(), is(cancelMethod));
+    assertThat(result.getConfirmMethod(), is(confirmMethod));
     assertThat(result.getServiceName(), is(serviceName));
     assertThat(result.getInstanceId(), is(serviceConfig.instanceId()));
     assertThat(result.getParentTxId(), is(parentTxId));
-//    assertThat(result.getStatus(), is(TransactionStatus.Succeed.name()));
+    //assertThat(result.getStatus(), is(TransactionStatus.Succeed.name()));
   }
 
   @Test
@@ -203,7 +203,7 @@ public class TccLoadBalanceSenderTest extends 
LoadBalanceSenderTestBase {
 
     // when 8080 was recovery, it will be routed again.
     startServerOnPort(8080);
-    await().atMost(2, TimeUnit.SECONDS).until(new Callable<Boolean>() {
+    await().atMost(3, TimeUnit.SECONDS).until(new Callable<Boolean>() {
       @Override
       public Boolean call() {
         return connected.get(8080).size() == 3;