From 83ef665cbac54c19668246ed734a7883717fe885 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Wed, 9 Dec 2015 10:36:25 +0100
Subject: [PATCH] fix tests

---
 .../routing/allocation/allocator/BalancedShardsAllocator.java  | 2 +-
 .../threadpool/UpdateThreadPoolSettingsTests.java              | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
index f52b3228c47..1388eddf76f 100644
--- a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
+++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
@@ -94,7 +94,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
     }
 
     public void setWeightFunction(float indexBalance, float shardBalanceFactor) {
-        weightFunction = new WeightFunction(indexBalance, weightFunction.shardBalance);
+        weightFunction = new WeightFunction(indexBalance, shardBalanceFactor);
     }
 
 
diff --git a/core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java b/core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java
index ddaa53fce7b..07f34071442 100644
--- a/core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java
+++ b/core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java
@@ -101,8 +101,9 @@ public class UpdateThreadPoolSettingsTests extends ESTestCase {
             );
             fail("expected IllegalArgumentException");
         } catch (IllegalArgumentException e) {
+            assertEquals("illegal value can't update [threadpool.] from [{}] to [{" + threadPoolName + ".type=" + invalidThreadPoolType.getType() + "}]", e.getMessage());
             assertThat(
-                    e.getMessage(),
+                    e.getCause().getMessage(),
                     is("setting threadpool." + threadPoolName + ".type to " + invalidThreadPoolType.getType() + " is not permitted; must be " + validThreadPoolType.getType()));
         } finally {
             terminateThreadPoolIfNeeded(threadPool);