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 2011/03/11 21:12:04 UTC
svn commit: r1080748 - in /lucene/dev/trunk:
lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
solr/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
Author: rmuir
Date: Fri Mar 11 20:12:04 2011
New Revision: 1080748
URL: http://svn.apache.org/viewvc?rev=1080748&view=rev
Log:
try to avoid jre bug in test, take 2
Modified:
lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
Modified: lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java?rev=1080748&r1=1080747&r2=1080748&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java Fri Mar 11 20:12:04 2011
@@ -586,7 +586,7 @@ public abstract class LuceneTestCase ext
// try to stop the thread:
t.setUncaughtExceptionHandler(null);
Thread.setDefaultUncaughtExceptionHandler(null);
- if (!t.getName().equals("main-EventThread")) t.interrupt();
+ t.interrupt();
try {
t.join(THREAD_STOP_GRACE_MSEC);
} catch (InterruptedException e) { e.printStackTrace(); }
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/ZkSolrClientTest.java?rev=1080748&r1=1080747&r2=1080748&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/ZkSolrClientTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/ZkSolrClientTest.java Fri Mar 11 20:12:04 2011
@@ -28,6 +28,7 @@ import org.apache.solr.util.AbstractSolr
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
+import org.junit.Ignore;
public class ZkSolrClientTest extends AbstractSolrTestCase {
private static final boolean DEBUG = false;
@@ -159,6 +160,7 @@ public class ZkSolrClientTest extends Ab
}
}
+ @Ignore("test case crashes modern jres")
public void testWatchChildren() throws Exception {
String zkDir = dataDir.getAbsolutePath() + File.separator
+ "zookeeper/server1/data";