You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/02/22 11:07:24 UTC

lucene-solr git commit: more test verbosity for exotic OS X only test failure

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_5_5 82d73e4d9 -> 73694c157


more test verbosity for exotic OS X only test failure


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/73694c15
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/73694c15
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/73694c15

Branch: refs/heads/branch_5_5
Commit: 73694c157b8266ef5c05191e91b104d96537bbdf
Parents: 82d73e4
Author: Mike McCandless <mi...@apache.org>
Authored: Mon Feb 22 05:07:12 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Mon Feb 22 05:07:12 2016 -0500

----------------------------------------------------------------------
 .../java/org/apache/lucene/index/ConcurrentMergeScheduler.java | 6 ++++++
 .../src/test/org/apache/lucene/TestMergeSchedulerExternal.java | 3 +++
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/73694c15/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java b/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
index dc9a5e9..0dd0a4d 100644
--- a/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
+++ b/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
@@ -672,11 +672,17 @@ public class ConcurrentMergeScheduler extends MergeScheduler {
 
   /** Used for testing */
   void setSuppressExceptions() {
+    if (verbose()) {
+      message("will suppress merge exceptions");
+    }
     suppressExceptions = true;
   }
 
   /** Used for testing */
   void clearSuppressExceptions() {
+    if (verbose()) {
+      message("will not suppress merge exceptions");
+    }
     suppressExceptions = false;
   }
   

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/73694c15/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
index 6abf2fa..307a1a7 100644
--- a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
+++ b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
@@ -74,6 +74,9 @@ public class TestMergeSchedulerExternal extends LuceneTestCase {
     @Override
     protected void handleMergeException(Directory dir, Throwable t) {
       excCalled = true;
+      if (infoStream.isEnabled("IW")) {
+        infoStream.message("IW", "TEST: now handleMergeException");
+      }
     }
 
     @Override