svn commit: r1512278 - in /lucene/dev/trunk: ./ solr/ solr/test-framework/ solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java

[dw...@apache.org]

Author: dweiss
Date: Fri Aug  9 12:15:59 2013
New Revision: 1512278

URL: http://svn.apache.org/r1512278
Log:
SOLR-4708: a follow-up commit that disables the clustering component in tests. This is needed because core tests are executed before the contribs are compiled so certain classes are not yet available (unless you already have them locally). An alternative would be to compile everything before any tests are  executed, but it seems that it'd add an extra unnecessary overhead to every build.


Modified:
    lucene/dev/trunk/   (props changed)
    lucene/dev/trunk/solr/   (props changed)
    lucene/dev/trunk/solr/test-framework/   (props changed)
    lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1512278&r1=1512277&r2=1512278&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Fri Aug  9 12:15:59 2013
@@ -114,9 +114,9 @@ public abstract class SolrTestCaseJ4 ext
   @SuppressWarnings("unused")
   private static void beforeClass() {
     System.setProperty("jetty.testMode", "true");
-    
     System.setProperty("enable.update.log", usually() ? "true" : "false");
     System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
+    System.setProperty("solr.clustering.enabled", "false");
     setupLogging();
     startTrackingSearchers();
     startTrackingZkClients();