From 185dbac8fe43195f19cb9bbb22e2fce9cf456fae Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Mon, 29 Jun 2015 09:54:21 +0200
Subject: [PATCH] Testing: Fix running of rest tests against external cluster

The TransportClient specified in the ExternalCluster was missing a
`path.home` setting and thus would not start.
---
 .../org/elasticsearch/test/ElasticsearchIntegrationTest.java  | 2 +-
 .../test/java/org/elasticsearch/test/ExternalTestCluster.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java b/core/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
index 7189faa4757..6ce280f04e7 100644
--- a/core/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
+++ b/core/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
@@ -1650,7 +1650,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
                 throw new IllegalArgumentException("port is not valid, expected number but was [" + split[1] + "]");
             }
         }
-        return new ExternalTestCluster(transportAddresses);
+        return new ExternalTestCluster(createTempDir(), transportAddresses);
     }
 
     protected TestCluster buildTestCluster(Scope scope, long seed) throws IOException {
diff --git a/core/src/test/java/org/elasticsearch/test/ExternalTestCluster.java b/core/src/test/java/org/elasticsearch/test/ExternalTestCluster.java
index e7258ca43c9..455c0f6a767 100644
--- a/core/src/test/java/org/elasticsearch/test/ExternalTestCluster.java
+++ b/core/src/test/java/org/elasticsearch/test/ExternalTestCluster.java
@@ -37,6 +37,7 @@ import org.elasticsearch.node.internal.InternalSettingsPreparer;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.nio.file.Path;
 import java.util.Iterator;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -64,12 +65,13 @@ public final class ExternalTestCluster extends TestCluster {
     private final int numDataNodes;
     private final int numMasterAndDataNodes;
 
-    public ExternalTestCluster(TransportAddress... transportAddresses) {
+    public ExternalTestCluster(Path tempDir, TransportAddress... transportAddresses) {
         super(0);
         Settings clientSettings = Settings.settingsBuilder()
                 .put("name", InternalTestCluster.TRANSPORT_CLIENT_PREFIX + EXTERNAL_CLUSTER_PREFIX + counter.getAndIncrement())
                 .put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true) // prevents any settings to be replaced by system properties.
                 .put("client.transport.ignore_cluster_name", true)
+                .put("path.home", tempDir)
                 .put("node.mode", "network").build(); // we require network here!
 
         this.client = TransportClient.builder().settings(clientSettings).build().addTransportAddresses(transportAddresses);