You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/09/20 19:27:15 UTC
svn commit: r999016 -
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
Author: rmuir
Date: Mon Sep 20 17:27:15 2010
New Revision: 999016
URL: http://svn.apache.org/viewvc?rev=999016&view=rev
Log:
LUCENE-2656: if tests fail, don't report about unclosed resources
Modified:
lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java?rev=999016&r1=999015&r2=999016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java Mon Sep 20 17:27:15 2010
@@ -287,6 +287,7 @@ public abstract class LuceneTestCase ext
savedTimeZone = TimeZone.getDefault();
timeZone = TEST_TIMEZONE.equals("random") ? randomTimeZone(seedRnd) : TimeZone.getTimeZone(TEST_TIMEZONE);
TimeZone.setDefault(timeZone);
+ testsFailed = false;
}
@AfterClass
@@ -297,16 +298,19 @@ public abstract class LuceneTestCase ext
System.clearProperty("solr.solr.home");
System.clearProperty("solr.data.dir");
// now look for unclosed resources
- for (MockDirectoryWrapper d : stores.keySet()) {
- if (d.isOpen()) {
- StackTraceElement elements[] = stores.get(d);
- StackTraceElement element = (elements.length > 1) ? elements[1] : null;
- fail("directory of test was not closed, opened from: " + element);
+ if (!testsFailed)
+ for (MockDirectoryWrapper d : stores.keySet()) {
+ if (d.isOpen()) {
+ StackTraceElement elements[] = stores.get(d);
+ StackTraceElement element = (elements.length > 1) ? elements[1] : null;
+ fail("directory of test was not closed, opened from: " + element);
+ }
}
- }
stores = null;
}
+ private static boolean testsFailed; /* true if any tests failed */
+
// This is how we get control when errors occur.
// Think of this as start/end/success/failed
// events.
@@ -315,6 +319,7 @@ public abstract class LuceneTestCase ext
@Override
public void failed(Throwable e, FrameworkMethod method) {
+ testsFailed = true;
reportAdditionalFailureInfo();
super.failed(e, method);
}