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/10/04 08:27:38 UTC
[servicecomb-pack] branch master updated (19386f2 -> 61c88cc)
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 19386f2 [SCB-1502] Code Cleanup (#566)
new 0ccf710 Try to fix the deploy error
new 61c88cc Try to fix the integration test 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:
.../java/org/apache/servicecomb/pack/integration/tests/PackIT.java | 6 +++---
scripts/deploy.sh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
[servicecomb-pack] 01/02: Try to fix the deploy 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 0ccf710c63385f2cbbd37fb854254b921c5d8026
Author: Willem Jiang <wi...@gmail.com>
AuthorDate: Fri Oct 4 09:54:26 2019 +0800
Try to fix the deploy error
---
scripts/deploy.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index a7680ec..719fe9d 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -18,7 +18,7 @@
#bin/sh
echo "Deploy a Non-Signed Staging Release"
- mvn deploy -Ddocker.skip -DskipTests --settings .travis.settings.xml
+ mvn deploy -B -Ddocker.skip -DskipTests --settings .travis.settings.xml
if [ $? == 0 ]; then
echo "${green}Snapshot Deployment is Success, please log on to Nexus Repo to see the snapshot release..${reset}"
else
[servicecomb-pack] 02/02: Try to fix the integration test 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 61c88cc95020b1842409330002398d4b36c15e2a
Author: Willem Jiang <wi...@gmail.com>
AuthorDate: Fri Oct 4 16:21:36 2019 +0800
Try to fix the integration test error
---
.../java/org/apache/servicecomb/pack/integration/tests/PackIT.java | 6 +++---
1 file changed, 3 insertions(+), 3 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 dd5fe08..95ae666 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
@@ -171,7 +171,7 @@ public class PackIT {
assertThat(txAbortedEvent.serviceName(), is(serviceName));
assertThat(txAbortedEvent.instanceId(), is(txStartedEvent2.instanceId()));
- // The TxAbortedEvent and TxCompensatedEvent could arrive in different order
+ // The TxAbortedEvent and TxCompensatedEvent could arrive in different order
TxEvent event = events.get(5);
checkedLastTwoEvents(globalTxId, txStartedEvent1, event);
@@ -280,7 +280,7 @@ public class PackIT {
assertThat(compensatedMessages.isEmpty(), is(true));
}
- @Test(timeout = 10000)
+ @Test(timeout = 15000)
public void compensateWhenRetryReachesMaximum() throws InterruptedException {
// retries 3 times and then compensate
ResponseEntity<String> entity = restTemplate.getForEntity("/open?name={name}&retries={retries}",
@@ -311,7 +311,7 @@ public class PackIT {
// This event is for the whole saga event
assertThat(events.get(9).type(), is("TxAbortedEvent"));
assertThat(events.get(10).type(), is("TxCompensatedEvent"));
-
+
assertThat(compensatedMessages, Matchers.contains("Goodbye, " + GreetingController.TRESPASSER));
}
}