fineract-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From my...@apache.org
Subject [fineract-cn-service-starter] 17/23: Fixed ribbon uses eureka property in test.
Date Mon, 22 Jan 2018 15:21:29 GMT
This is an automated email from the ASF dual-hosted git repository.

myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-service-starter.git

commit 0d8a554d3007d7e4282fd209a720e4bfc398ea78
Author: myrle-krantz <mkrantz@mifos.org>
AuthorDate: Mon May 29 16:51:36 2017 +0200

    Fixed ribbon uses eureka property in test.
---
 .../mifos/core/test/servicestarter/IntegrationTestEnvironment.java  | 2 +-
 src/main/java/io/mifos/core/test/servicestarter/Microservice.java   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/mifos/core/test/servicestarter/IntegrationTestEnvironment.java
b/src/main/java/io/mifos/core/test/servicestarter/IntegrationTestEnvironment.java
index a9a7bb9..267db7b 100644
--- a/src/main/java/io/mifos/core/test/servicestarter/IntegrationTestEnvironment.java
+++ b/src/main/java/io/mifos/core/test/servicestarter/IntegrationTestEnvironment.java
@@ -81,7 +81,7 @@ public class IntegrationTestEnvironment extends ExternalResource {
     properties.setProperty(MARIADB_USER_PROPERTY, MARIADB_USER_DEFAULT);
     properties.setProperty(MARIADB_PASSWORD_PROPERTY, MARIADB_PASSWORD_DEFAULT);
     properties.setProperty(HYSTRIX_ENABLED_PROPERTY, HYSTRIX_ENABLED_DEFAULT);
-    properties.setProperty(RIBBON_USES_EUREKA_PROPERTY, RIBBON_USES_EUREKA_DEFAULT);
+    properties.setProperty(RIBBON_USES_EUREKA_PROPERTY, "true");
     this.keyPairHolder = RsaKeyPairFactory.createKeyPair();
     properties.setProperty(SYSTEM_PUBLIC_KEY_TIMESTAMP_PROPERTY, this.keyPairHolder.getTimestamp());
     properties.setProperty(SYSTEM_PUBLIC_KEY_MODULUS_PROPERTY, this.keyPairHolder.publicKey().getModulus().toString());
diff --git a/src/main/java/io/mifos/core/test/servicestarter/Microservice.java b/src/main/java/io/mifos/core/test/servicestarter/Microservice.java
index 0a143c5..2fc6c43 100644
--- a/src/main/java/io/mifos/core/test/servicestarter/Microservice.java
+++ b/src/main/java/io/mifos/core/test/servicestarter/Microservice.java
@@ -31,8 +31,6 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
-import static io.mifos.core.test.env.TestEnvironment.SPRING_CLOUD_DISCOVERY_ENABLED_PROPERTY;
-
 /**
  * @author Myrle Krantz
  */
@@ -65,7 +63,7 @@ public class Microservice<T> extends ExternalResource {
     //https://github.com/spring-cloud/spring-cloud-netflix/issues/373
     //http://blog.abhijitsarkar.org/technical/netflix-eureka/
     processEnvironment.setProperty("eureka.client.serviceUrl.defaultZone", EurekaForTest.DEFAULT_ZONE);
-    processEnvironment.setProperty(SPRING_CLOUD_DISCOVERY_ENABLED_PROPERTY, "true");
+    processEnvironment.setProperty(TestEnvironment.SPRING_CLOUD_DISCOVERY_ENABLED_PROPERTY,
"true");
     processEnvironment.setProperty("eureka.instance.hostname", "localhost");
     processEnvironment.setProperty("eureka.client.fetchRegistry", "true");
     processEnvironment.setProperty("eureka.registration.enabled", "true");
@@ -74,6 +72,8 @@ public class Microservice<T> extends ExternalResource {
     processEnvironment.setProperty("eureka.client.instanceInfoReplicationIntervalSeconds",
"1");
     processEnvironment.setProperty("activemq.brokerUrl", ActiveMQForTest.BIND_ADDRESS);
 
+    processEnvironment.setProperty(TestEnvironment.RIBBON_USES_EUREKA_PROPERTY, "true");
+
     this.integrationTestEnvironment = integrationTestEnvironment;
   }
 

-- 
To stop receiving notification emails like this one, please contact
myrle@apache.org.

Mime
View raw message