From 234c46008a2fa6bbcd9a9e53f470321fc8cf7ca7 Mon Sep 17 00:00:00 2001
From: Yonik Seeley <yonik@apache.org>
Date: Tue, 23 Mar 2010 20:44:05 +0000
Subject: [PATCH] tests: ignore expected exceptions

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@926768 13f79535-47bb-0310-9956-ffa450edef68
---
 .../test/org/apache/solr/BaseDistributedSearchTestCase.java   | 1 +
 solr/src/test/org/apache/solr/TestDistributedSearch.java      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java
index 403becbf0ea..d834dafffe2 100644
--- a/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java
+++ b/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java
@@ -111,6 +111,7 @@ public abstract class BaseDistributedSearchTestCase extends TestCase {
 
   @Override
   public void setUp() throws Exception {
+    SolrTestCaseJ4.resetExceptionIgnores();  // ignore anything with ignore_exception in it
     super.setUp();
     System.setProperty("solr.test.sys.prop1", "propone");
     System.setProperty("solr.test.sys.prop2", "proptwo");
diff --git a/solr/src/test/org/apache/solr/TestDistributedSearch.java b/solr/src/test/org/apache/solr/TestDistributedSearch.java
index f5d4eaf321b..dfc03acd72d 100755
--- a/solr/src/test/org/apache/solr/TestDistributedSearch.java
+++ b/solr/src/test/org/apache/solr/TestDistributedSearch.java
@@ -50,8 +50,8 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
   String tdate = "n_tdt";
   
   String oddField="oddField_s";
-  String missingField="missing_but_valid_field_t";
-  String invalidField="invalid_field_not_in_schema";
+  String missingField="ignore_exception__missing_but_valid_field_t";
+  String invalidField="ignore_exception__invalid_field_not_in_schema";
 
   @Override
   public void doTest() throws Exception {