You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by se...@apache.org on 2018/01/15 06:37:36 UTC
[incubator-servicecomb-saga] 02/03: SCB-211 attempted to fix test
failure
This is an automated email from the ASF dual-hosted git repository.
seanyinx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit d49f77af7f8129338e1de173c043a32326a3a9ac
Author: Eric Lee <da...@huawei.com>
AuthorDate: Fri Jan 12 10:51:42 2018 +0800
SCB-211 attempted to fix test failure
Signed-off-by: Eric Lee <da...@huawei.com>
---
.../connector/grpc/LoadBalancedClusterMessageSenderTest.java | 10 ++++++++++
.../omega/connector/grpc/PushBackReconnectRunnableTest.java | 1 -
.../saga/omega/transaction/SagaStartAspectTest.java | 7 +++++--
.../saga/omega/transaction/TransactionAspectTest.java | 7 +++++--
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java
index 3c49654..22ddf21 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java
@@ -296,6 +296,8 @@ public class LoadBalancedClusterMessageSenderTest {
}
private int killServerReceivedMessage() {
+ await().atMost(1, SECONDS).until(this::hasAnyReceivedEvents);
+
for (int port : eventsMap.keySet()) {
if (!eventsMap.get(port).isEmpty()) {
Server serverToKill = servers.get(port);
@@ -306,6 +308,14 @@ public class LoadBalancedClusterMessageSenderTest {
throw new IllegalStateException("None of the servers received any message");
}
+ private boolean hasAnyReceivedEvents() {
+ boolean result = false;
+ for (int port : ports) {
+ result |= eventsMap.get(port).isEmpty();
+ }
+ return result;
+ }
+
private static class MyTxEventService extends TxEventServiceImplBase {
private final Queue<String> connected;
private final Queue<TxEvent> events;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/PushBackReconnectRunnableTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/PushBackReconnectRunnableTest.java
index 0d5692f..d1fd183 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/PushBackReconnectRunnableTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/PushBackReconnectRunnableTest.java
@@ -45,7 +45,6 @@ public class PushBackReconnectRunnableTest {
private final Map<MessageSender, Long> senders = new HashMap<>();
private final ReentrantLock lock = new ReentrantLock();
-
private final Condition condition = lock.newCondition();
private final PushBackReconnectRunnable pushBack = new PushBackReconnectRunnable(sender, senders, runnables, lock,
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspectTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspectTest.java
index e2a1c62..2370325 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspectTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspectTest.java
@@ -29,8 +29,9 @@ import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
@@ -56,6 +57,8 @@ public class SagaStartAspectTest {
private final OmegaContext omegaContext = new OmegaContext(idGenerator);
private final SagaStartAspect aspect = new SagaStartAspect(sender, omegaContext);
+ private final ExecutorService executor = Executors.newSingleThreadExecutor();
+
@Before
public void setUp() throws Exception {
when(idGenerator.nextId()).thenReturn(globalTxId);
@@ -122,7 +125,7 @@ public class SagaStartAspectTest {
return null;
});
- CompletableFuture.runAsync(() -> {
+ executor.execute(() -> {
try {
aspect.advise(joinPoint, sagaStart);
} catch (Throwable throwable) {
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java
index dabfbc7..2d92d0f 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java
@@ -28,8 +28,9 @@ import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
@@ -58,6 +59,8 @@ public class TransactionAspectTest {
private final OmegaContext omegaContext = new OmegaContext(idGenerator);
private final TransactionAspect aspect = new TransactionAspect(sender, omegaContext);
+ private final ExecutorService executor = Executors.newSingleThreadExecutor();
+
@Before
public void setUp() throws Exception {
when(idGenerator.nextId()).thenReturn(newLocalTxId);
@@ -127,7 +130,7 @@ public class TransactionAspectTest {
return null;
});
- CompletableFuture.runAsync(() -> {
+ executor.execute(() -> {
try {
// need to setup the thread local for it
omegaContext.setGlobalTxId(globalTxId);
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.