Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try to avoid jre bug in test, take 2 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1080748 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2011-03-11 20:12:04 +00:00
parent f047d92429
commit 969067c0e2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
View File

@ -586,7 +586,7 @@ public abstract class LuceneTestCase extends Assert {
// try to stop the thread: // try to stop the thread:
t.setUncaughtExceptionHandler(null); t.setUncaughtExceptionHandler(null);
Thread.setDefaultUncaughtExceptionHandler(null); Thread.setDefaultUncaughtExceptionHandler(null);
if (!t.getName().equals("main-EventThread")) t.interrupt(); t.interrupt();
try { try {
t.join(THREAD_STOP_GRACE_MSEC); t.join(THREAD_STOP_GRACE_MSEC);
} catch (InterruptedException e) { e.printStackTrace(); } } catch (InterruptedException e) { e.printStackTrace(); }

2
solr/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
View File

@ -28,6 +28,7 @@ import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher; import org.apache.zookeeper.Watcher;
import org.junit.Ignore;
public class ZkSolrClientTest extends AbstractSolrTestCase { public class ZkSolrClientTest extends AbstractSolrTestCase {
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
@ -159,6 +160,7 @@ public class ZkSolrClientTest extends AbstractSolrTestCase {
} }
} }
@Ignore("test case crashes modern jres")
public void testWatchChildren() throws Exception { public void testWatchChildren() throws Exception {
String zkDir = dataDir.getAbsolutePath() + File.separator String zkDir = dataDir.getAbsolutePath() + File.separator
+ "zookeeper/server1/data"; + "zookeeper/server1/data";