From commits-return-1387-archive-asf-public=cust-asf.ponee.io@fineract.apache.org Mon Jan 22 16:21:17 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 62885180799 for ; Mon, 22 Jan 2018 16:21:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 520B4160C52; Mon, 22 Jan 2018 15:21:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6F740160C53 for ; Mon, 22 Jan 2018 16:21:15 +0100 (CET) Received: (qmail 11696 invoked by uid 500); 22 Jan 2018 15:21:14 -0000 Mailing-List: contact commits-help@fineract.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@fineract.apache.org Delivered-To: mailing list commits@fineract.apache.org Received: (qmail 11584 invoked by uid 99); 22 Jan 2018 15:21:14 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jan 2018 15:21:14 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 9F4E48200A; Mon, 22 Jan 2018 15:21:13 +0000 (UTC) Date: Mon, 22 Jan 2018 15:21:29 +0000 To: "commits@fineract.apache.org" Subject: [fineract-cn-service-starter] 17/23: Fixed ribbon uses eureka property in test. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: myrle@apache.org In-Reply-To: <151663447272.6873.8308467137000078450@gitbox.apache.org> References: <151663447272.6873.8308467137000078450@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: fineract-cn-service-starter X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Rev: 0d8a554d3007d7e4282fd209a720e4bfc398ea78 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180122152113.9F4E48200A@gitbox.apache.org> 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 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 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 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.