You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2019/08/17 03:54:50 UTC
[servicecomb-pack] branch master updated (849eb38 -> 6ab3a53)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git.
from 849eb38 SCB-1442 check KafkaMessagePublisher msg type
new 06d837d Try to fix the CI build error
new 6ab3a53 Try to fix the Travis CI build error
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../servicecomb/pack/alpha/server/tcc/AlphaTccServerTestBase.java | 6 +++---
.../java/org/apache/servicecomb/pack/integration/tests/PackIT.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
[servicecomb-pack] 02/02: Try to fix the Travis CI build error
Posted by ni...@apache.org.
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
commit 6ab3a539f83cb0d8d3b850375fa6bc5ade1f18a0
Author: Willem Jiang <wi...@gmail.com>
AuthorDate: Sat Aug 17 11:22:30 2019 +0800
Try to fix the Travis CI build error
---
.../servicecomb/pack/alpha/server/tcc/AlphaTccServerTestBase.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccServerTestBase.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccServerTestBase.java
index df5161b..9aada8a 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccServerTestBase.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccServerTestBase.java
@@ -248,8 +248,8 @@ public abstract class AlphaTccServerTestBase {
.build();
asyncStub.onConnected(config, commandStreamObserver);
- await().atMost(1, SECONDS).until(() -> (OmegaCallbacksRegistry.getRegistry().get(serviceName) != null));
- await().atMost(1, SECONDS).until(() -> (OmegaCallbacksRegistry.getRegistry().get(serviceName).size() == 2));
+ await().atMost(2, SECONDS).until(() -> (OmegaCallbacksRegistry.getRegistry().get(serviceName) != null));
+ await().atMost(2, SECONDS).until(() -> (OmegaCallbacksRegistry.getRegistry().get(serviceName).size() == 2));
OmegaCallbacksRegistry.getRegistry().get(serviceName).remove(instanceId);
blockingStub.onTccTransactionStarted(newTxStart());
@@ -257,7 +257,7 @@ public abstract class AlphaTccServerTestBase {
blockingStub.onParticipationEnded(newParticipationEndedEvent("Succeed"));
GrpcAck result = blockingStub.onTccTransactionEnded(newTxEnd("Succeed"));
- await().atMost(2, SECONDS).until(() -> !receivedCommands.isEmpty());
+ await().atMost(4, SECONDS).until(() -> !receivedCommands.isEmpty());
assertThat(receivedCommands.size(), is(1));
GrpcTccCoordinateCommand command = receivedCommands.poll();
assertThat(command.getMethod(), is("confirm"));
[servicecomb-pack] 01/02: Try to fix the CI build error
Posted by ni...@apache.org.
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
commit 06d837d6da9bcf76c9b81c496b44f6b9410b0956
Author: Willem Jiang <wi...@gmail.com>
AuthorDate: Fri Aug 16 08:56:02 2019 +0800
Try to fix the CI build error
---
.../java/org/apache/servicecomb/pack/integration/tests/PackIT.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
index a49eca3..4b89439 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
@@ -249,7 +249,7 @@ public class PackIT {
assertThat(compensatedMessages.isEmpty(), is(true));
}
- @Test(timeout = 5000)
+ @Test(timeout = 7000)
public void retrySubTransactionSuccess() {
ResponseEntity<String> entity = restTemplate.getForEntity("/open?name={name}&retries={retries}",
String.class,
@@ -259,7 +259,7 @@ public class PackIT {
assertThat(entity.getStatusCode(), is(OK));
assertThat(entity.getBody(), is("Greetings, eric; Welcome to visit the zoo, eric"));
- await().atMost(3, SECONDS).until(() -> eventRepo.count() == 8);
+ await().atMost(5, SECONDS).until(() -> eventRepo.count() == 8);
List<String> distinctGlobalTxIds = eventRepo.findDistinctGlobalTxId();
assertThat(distinctGlobalTxIds.size(), is(1));