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 2012/04/19 20:05:04 UTC
svn commit: r1328056 - in /lucene/dev/trunk/solr/core/src:
test-files/solr/conf/ test/org/apache/solr/search/
Author: rmuir
Date: Thu Apr 19 18:05:03 2012
New Revision: 1328056
URL: http://svn.apache.org/viewvc?rev=1328056&view=rev
Log:
beef up a few test configs to use Mock[FS]DirectoryFactory
Modified:
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-basic-luceneVersion31.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-caching.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-tlog.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-update-processor-chains.xml
lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-basic-luceneVersion31.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-basic-luceneVersion31.xml?rev=1328056&r1=1328055&r2=1328056&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-basic-luceneVersion31.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-basic-luceneVersion31.xml Thu Apr 19 18:05:03 2012
@@ -21,5 +21,6 @@
DO NOT ADD THINGS TO THIS CONFIG! -->
<config>
<luceneMatchVersion>LUCENE_31</luceneMatchVersion>
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
</config>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-caching.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-caching.xml?rev=1328056&r1=1328055&r2=1328056&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-caching.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-caching.xml Thu Apr 19 18:05:03 2012
@@ -16,6 +16,7 @@
-->
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<query>
<cache name="lfuCacheDecayFalse"
class="solr.search.LFUCache"
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-tlog.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-tlog.xml?rev=1328056&r1=1328055&r2=1328056&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-tlog.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-tlog.xml Thu Apr 19 18:05:03 2012
@@ -19,7 +19,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
-
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<dataDir>${solr.data.dir:}</dataDir>
<requestHandler name="standard" class="solr.StandardRequestHandler">
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-update-processor-chains.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-update-processor-chains.xml?rev=1328056&r1=1328055&r2=1328056&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-update-processor-chains.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-update-processor-chains.xml Thu Apr 19 18:05:03 2012
@@ -25,6 +25,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<updateRequestProcessorChain name="comprehensive">
<processor class="solr.FieldLengthUpdateProcessorFactory">
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java?rev=1328056&r1=1328055&r2=1328056&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java Thu Apr 19 18:05:03 2012
@@ -27,6 +27,7 @@ import org.apache.solr.update.DirectUpda
import org.apache.solr.update.UpdateLog;
import org.apache.solr.update.UpdateHandler;
import org.apache.solr.update.UpdateLog;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -43,11 +44,25 @@ import static org.apache.solr.update.pro
public class TestRecovery extends SolrTestCaseJ4 {
private static String SEEN_LEADER_VAL="true"; // value that means we've seen the leader and have version info (i.e. we are a non-leader replica)
private static int timeout=60; // acquire timeout in seconds. change this to a huge number when debugging to prevent threads from advancing.
+
+ // TODO: fix this test to not require FSDirectory
+ static String savedFactory;
@BeforeClass
public static void beforeClass() throws Exception {
+ savedFactory = System.getProperty("solr.DirectoryFactory");
+ System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory");
initCore("solrconfig-tlog.xml","schema12.xml");
}
+
+ @AfterClass
+ public static void afterClass() throws Exception {
+ if (savedFactory == null) {
+ System.clearProperty("solr.directoryFactory");
+ } else {
+ System.setProperty("solr.directoryFactory", savedFactory);
+ }
+ }
@Test
public void testLogReplay() throws Exception {