From 54b79934ea720074d56c60cbc6373c28cc9571ba Mon Sep 17 00:00:00 2001
From: Mark Robert Miller <markrmiller@apache.org>
Date: Sun, 4 Mar 2012 18:39:27 +0000
Subject: [PATCH] make sure we clear numShards sys prop

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

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 efbde20086c..3a3dbbe5bc7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
@@ -65,6 +65,7 @@ public class ChaosMonkeyNothingIsSafeTest extends FullSolrCloudTest {
   @Override
   @After
   public void tearDown() throws Exception {
+    System.clearProperty("numShards");
     super.tearDown();
     resetExceptionIgnores();
   }
diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
index 24635de636e..29402a1a7ab 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
@@ -61,6 +61,7 @@ public class ChaosMonkeySafeLeaderTest extends FullSolrCloudTest {
   @Override
   @After
   public void tearDown() throws Exception {
+    System.clearProperty("numShards");
     super.tearDown();
     resetExceptionIgnores();
   }