You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/03/25 07:35:19 UTC
[james-project] 04/04: JAMES-2387 Cassandra migration stability
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 1c833d1ec831abc94172772cd6aac638e341b6a5
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Mar 22 14:56:01 2019 +0700
JAMES-2387 Cassandra migration stability
I can not figure out why sometime the version is not up to date after the task migration is executed
After all, relaxing the test condition, and requiring the version to be eventually updated seems acceptable
---
.../integration/WebAdminServerIntegrationTest.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
index 3a68272..4736e90 100644
--- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
@@ -53,6 +53,8 @@ import org.apache.james.webadmin.routes.TasksRoutes;
import org.apache.james.webadmin.routes.UserMailboxesRoutes;
import org.apache.james.webadmin.routes.UserRoutes;
import org.apache.james.webadmin.swagger.routes.SwaggerRoutes;
+import org.awaitility.Awaitility;
+import org.awaitility.Duration;
import org.eclipse.jetty.http.HttpStatus;
import org.junit.After;
import org.junit.Before;
@@ -260,12 +262,16 @@ public class WebAdminServerIntegrationTest {
with()
.get("/task/" + taskId + "/await");
- when()
- .get(VERSION)
- .then()
- .statusCode(HttpStatus.OK_200)
- .contentType(JSON_CONTENT_TYPE)
- .body(is("{\"version\":" + CassandraSchemaVersionManager.MAX_VERSION.getValue() + "}"));
+ Awaitility.await()
+ .atMost(Duration.TEN_SECONDS)
+ .await()
+ .untilAsserted(() ->
+ when()
+ .get(VERSION)
+ .then()
+ .statusCode(HttpStatus.OK_200)
+ .contentType(JSON_CONTENT_TYPE)
+ .body(is("{\"version\":" + CassandraSchemaVersionManager.MAX_VERSION.getValue() + "}")));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org