From 1642dffa599a4ae41a42f9b208052eb7d966705b Mon Sep 17 00:00:00 2001
From: Mark Robert Miller <markrmiller@apache.org>
Date: Sat, 2 Nov 2013 01:23:19 +0000
Subject: [PATCH] tests: blockUntilFinished when stopping concurrent solrserver

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1538126 13f79535-47bb-0310-9956-ffa450edef68
---
 .../test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
index afbffc57b9e..3b6201dce02 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
@@ -334,6 +334,7 @@ public class ChaosMonkeyNothingIsSafeTest extends AbstractFullDistribZkTestBase
     @Override
     public void safeStop() {
       stop = true;
+      suss.blockUntilFinished();
       suss.shutdownNow();
       httpClient.getConnectionManager().shutdown();
     }