You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by an...@apache.org on 2019/09/07 14:08:09 UTC
[fineract] branch develop updated: make integrationTest await
application health readyness
This is an automated email from the ASF dual-hosted git repository.
angeh pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 89334bd make integrationTest await application health readyness
new 71b456c Merge pull request #619 from vorburger/IntegrationTest-Utils-await-health
89334bd is described below
commit 89334bdb956ca5cf9dad73abdfa13bae9265c979
Author: Michael Vorburger.ch <mi...@vorburger.ch>
AuthorDate: Tue Jul 9 21:07:50 2019 +0200
make integrationTest await application health readyness
This was an idea I had when wondering if the problem we hit
during the Gradle upgrade was just that Tomcat took longer to
boot Fineract (it turned out that that wasn't the cause).
I'm not sure if gradle-tomcat-plugin already does the equivalent
(but suspect it does not), but given that integrationTests work,
not entirely clear how much value this really adds.
Given that it doesn't really hurt either, perhaps we can add it anyway.
---
.../fineract/integrationtests/common/Utils.java | 66 ++++++++++++++++++++--
1 file changed, 60 insertions(+), 6 deletions(-)
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java
index 3f99b34..d029d8b 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java
@@ -28,17 +28,24 @@ import java.io.File;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Locale;
+import java.util.Random;
+import java.util.TimeZone;
+
+import com.jayway.restassured.RestAssured;
+import com.jayway.restassured.path.json.JsonPath;
+import com.jayway.restassured.response.Response;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
import org.apache.commons.lang.StringUtils;
import org.apache.http.conn.HttpHostConnectException;
import org.joda.time.DateTimeZone;
import org.joda.time.LocalDate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
/**
* Util for RestAssured tests. This class here in src/integrationTest is
* copy/pasted to src/test; please keep them in sync.
@@ -46,13 +53,16 @@ import com.jayway.restassured.specification.ResponseSpecification;
@SuppressWarnings("unchecked")
public class Utils {
+ private final static Logger logger = LoggerFactory.getLogger(Utils.class);
+
public static final String TENANT_PARAM_NAME = "tenantIdentifier";
public static final String DEFAULT_TENANT = "default";
public static final String TENANT_IDENTIFIER = TENANT_PARAM_NAME + '=' + DEFAULT_TENANT;
public static final String TENANT_TIME_ZONE = "Asia/Kolkata";
- private static final String LOGIN_URL = "/fineract-provider/api/v1/authentication?username=mifos&password=password&" + TENANT_IDENTIFIER;
+ private static final String HEALTH_URL = "/fineract-provider/health";
+ private static final String LOGIN_URL = "/fineract-provider/api/v1/authentication?username=mifos&password=password&" + TENANT_IDENTIFIER;
public static void initializeRESTAssured() {
RestAssured.baseURI = "https://localhost";
@@ -60,8 +70,51 @@ public class Utils {
RestAssured.keystore("src/main/resources/keystore.jks", "openmf");
}
+ private static void awaitSpringBootActuatorHealthyUp() {
+ int attempt = 0;
+ final int max_attempts = 10;
+ Response response = null;
+ Exception lastException = null;
+ do {
+ try {
+ response = RestAssured.get(HEALTH_URL);
+ int healthHttpStatus = response.statusCode();
+ if (healthHttpStatus == 200) {
+ logger.info("{} return HTTP 200, application is now ready for integration testing!", HEALTH_URL);
+ return;
+ } else {
+ logger.info("{} returned HTTP {}, going to wait and retry (attempt {})", new Object[] { HEALTH_URL, healthHttpStatus, attempt++ });
+ sleep(3);
+ }
+ } catch (Exception e) {
+ logger.info("{} caused {}, going to wait and retry (attempt {})", HEALTH_URL, new Object[] { e.getMessage(), attempt++ });
+ lastException = e;
+ sleep(3);
+ }
+ } while (attempt < max_attempts);
+
+ if (lastException != null) {
+ logger.error("{} still not reachable, giving up", HEALTH_URL, lastException);
+ throw new AssertionError(HEALTH_URL + " not reachable", lastException);
+ } else {
+ logger.error("{} still has not returned HTTP 200, giving up; (last) body: ", HEALTH_URL, response.prettyPrint());
+ fail(HEALTH_URL + " returned " + response.prettyPrint());
+ }
+ }
+
+ private static void sleep(int seconds) {
+ try {
+ Thread.sleep(seconds * 1000);
+ } catch (InterruptedException e) {
+ logger.warn("Unexpected InterruptedException", e);
+ throw new IllegalStateException("Unexpected InterruptedException", e);
+ }
+ }
+
public static String loginIntoServerAndGetBase64EncodedAuthenticationKey() {
+ awaitSpringBootActuatorHealthyUp();
try {
+ logger.info("Logging in, for integration test...");
System.out.println("-----------------------------------LOGIN-----------------------------------------");
final String json = RestAssured.post(LOGIN_URL).asString();
assertThat("Failed to login into fineract platform", StringUtils.isBlank(json), is(false));
@@ -205,3 +258,4 @@ public class Utils {
return templateLocation.substring(1,templateLocation.length()-1);
}
}
+