svn commit: r1340687 - in /lucene/dev/trunk/solr/core/src/test/org/apache/solr: core/TestSolrDeletionPolicy1.java update/SoftAutoCommitTest.java

[us...@apache.org]

Author: uschindler
Date: Sun May 20 12:06:22 2012
New Revision: 1340687

URL: http://svn.apache.org/viewvc?rev=1340687&view=rev
Log:
SOLR-3471: Disable tests that don't work correctly on Windows

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java?rev=1340687&r1=1340686&r2=1340687&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java Sun May 20 12:06:22 2012
@@ -17,6 +17,7 @@
 package org.apache.solr.core;
 
 import org.apache.lucene.index.IndexCommit;
+import org.apache.lucene.util.Constants;
 import org.apache.solr.SolrTestCaseJ4;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -109,6 +110,9 @@ public class TestSolrDeletionPolicy1 ext
 
   @Test
   public void testCommitAge() throws InterruptedException {
+    assumeFalse("This test is not working on Windows (or maybe machines with only 2 CPUs)",
+      Constants.WINDOWS);
+  
     IndexDeletionPolicyWrapper delPolicy = h.getCore().getDeletionPolicy();
     addDocs();
     Map<Long, IndexCommit> commits = delPolicy.getCommits();

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java?rev=1340687&r1=1340686&r2=1340687&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java Sun May 20 12:06:22 2012
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertEqu
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import org.apache.lucene.util.Constants;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.core.SolrEventListener;
@@ -62,6 +63,9 @@ public class SoftAutoCommitTest extends 
     
   @Before
   public void createMonitor() throws Exception {
+    assumeFalse("This test is not working on Windows (or maybe machines with only 2 CPUs)",
+      Constants.WINDOWS);
+  
     SolrCore core = h.getCore();
 
     updater = (DirectUpdateHandler2) core.getUpdateHandler();