This is an automated email from the ASF dual-hosted git repository.

dsmiley pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 2b37abf2cd9 Default to MockDirectoryFactory in test configs (#2598)
2b37abf2cd9 is described below

commit 2b37abf2cd9617833c79b8491ef4e41452bddec5
Author: Jason Gerlowski <[email protected]>
AuthorDate: Tue Jul 30 13:59:14 2024 -0400

    Default to MockDirectoryFactory in test configs (#2598)
    
    This was already the effective default value, by virtue of it being set
    in 'randomization.gradle'.  But setting the value there instead of in
    the config files themselves meant that the value wasn't being properly
    set for IDE test runners.
    
    This commit fixes this by removing the 'randomization.gradle' setting
    and instead setting MockDirectoryFactory as the default (via ${}
    expansion syntax) in each individual test solrconfig file.
    
    (cherry picked from commit c7630fe13ff9e5475c0c358beb9e92c12826e599)
---
 gradle/testing/randomization.gradle                                   | 1 -
 .../src/test-files/solr/collection1/conf/bad-error-solrconfig.xml     | 2 +-
 solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml | 2 +-
 solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml     | 2 +-
 .../core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml | 2 +-
 .../conf/solrconfig-add-schema-fields-update-processor-chains.xml     | 2 +-
 .../test-files/solr/collection1/conf/solrconfig-analytics-query.xml   | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml   | 2 +-
 .../solr/collection1/conf/solrconfig-cache-enable-disable.xml         | 2 +-
 .../test-files/solr/collection1/conf/solrconfig-classification.xml    | 2 +-
 .../test-files/solr/collection1/conf/solrconfig-collapseqparser.xml   | 2 +-
 .../test-files/solr/collection1/conf/solrconfig-components-name.xml   | 2 +-
 .../solr/collection1/conf/solrconfig-concurrentmergescheduler.xml     | 2 +-
 .../test-files/solr/collection1/conf/solrconfig-coreproperties.xml    | 2 +-
 .../solr/collection1/conf/solrconfig-delaying-component.xml           | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml    | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml    | 2 +-
 .../collection1/conf/solrconfig-distrib-update-processor-chains.xml   | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml | 2 +-
 .../solr/collection1/conf/solrconfig-externalversionconstraint.xml    | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-follower-auth.xml | 2 +-
 .../core/src/test-files/solr/collection1/conf/solrconfig-follower.xml | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-follower1.xml     | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-functionquery.xml | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-highlight.xml     | 2 +-
 .../solr/collection1/conf/solrconfig-implicitproperties.xml           | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig-leader.xml  | 2 +-
 .../solr/collection1/conf/solrconfig-leader1-keepOneBackup.xml        | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1.xml | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig-leader2.xml | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig-leader3.xml | 2 +-
 .../solr/collection1/conf/solrconfig-legacy-circuitbreaker.xml        | 2 +-
 .../solr/collection1/conf/solrconfig-logmergepolicyfactory.xml        | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-lucene-codec.xml  | 2 +-
 .../solr/collection1/conf/solrconfig-managed-schema-test.xml          | 2 +-
 .../solr/collection1/conf/solrconfig-mergepolicy-defaults.xml         | 2 +-
 .../solr/collection1/conf/solrconfig-mergepolicy-legacy.xml           | 2 +-
 .../solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml     | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml | 2 +-
 .../solr/collection1/conf/solrconfig-nomergepolicyfactory.xml         | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-noopregen.xml     | 2 +-
 .../test-files/solr/collection1/conf/solrconfig-parallel-commit.xml   | 2 +-
 .../core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml | 2 +-
 .../collection1/conf/solrconfig-parsing-update-processor-chains.xml   | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml | 2 +-
 .../solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml     | 2 +-
 .../test-files/solr/collection1/conf/solrconfig-query-parser-init.xml | 2 +-
 .../solr/collection1/conf/solrconfig-querysender-noquery.xml          | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-querysender.xml   | 2 +-
 .../core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml | 2 +-
 .../solr/collection1/conf/solrconfig-replication-legacy.xml           | 2 +-
 .../solr/collection1/conf/solrconfig-response-log-component.xml       | 2 +-
 .../solr/collection1/conf/solrconfig-searcher-listeners1.xml          | 2 +-
 .../solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml    | 2 +-
 .../test-files/solr/collection1/conf/solrconfig-sortingresponse.xml   | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml | 2 +-
 .../solr/collection1/conf/solrconfig-spellcheckcomponent.xml          | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml  | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig-tagger.xml  | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-test-misc.xml     | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml | 2 +-
 .../solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml     | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-transformers.xml  | 2 +-
 .../solr/collection1/conf/solrconfig-update-processor-chains.xml      | 2 +-
 .../collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml   | 2 +-
 .../core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig.xml         | 2 +-
 .../test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml   | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml   | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml  | 2 +-
 solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml    | 2 +-
 .../test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml    | 2 +-
 .../src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml  | 2 +-
 .../test-files/solr/configsets/exitable-directory/conf/solrconfig.xml | 2 +-
 solr/core/src/test-files/solr/configsets/minimal/conf/solrconfig.xml  | 2 +-
 .../analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml   | 2 +-
 .../solr/collection1/conf/solrconfig-opennlp-extract.xml              | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-analytics.xml     | 2 +-
 .../src/test-files/clustering/solr/collection1/conf/solrconfig.xml    | 2 +-
 .../extraction/solr/collection1/conf/solrconfig-minimal.xml           | 2 +-
 .../src/test-files/extraction/solr/collection1/conf/solrconfig.xml    | 2 +-
 .../langid/solr/collection1/conf/solrconfig-languageidentifier.xml    | 2 +-
 .../ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml       | 2 +-
 .../src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml   | 2 +-
 .../ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml  | 2 +-
 .../solr/collection1/conf/solrconfig-script-updateprocessor.xml       | 2 +-
 .../collection1/conf/stateless-solrconfig-script-updateprocessor.xml  | 2 +-
 .../test-files/solrj/solr/collection1/conf/solrconfig-follower1.xml   | 2 +-
 .../src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml   | 2 +-
 solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java      | 4 ----
 .../src/test-files/solr/collection1/conf/solrconfig.xml               | 2 +-
 94 files changed, 92 insertions(+), 97 deletions(-)

diff --git a/gradle/testing/randomization.gradle 
b/gradle/testing/randomization.gradle
index 115555951ac..4bb30c48ed7 100644
--- a/gradle/testing/randomization.gradle
+++ b/gradle/testing/randomization.gradle
@@ -128,7 +128,6 @@ configure(allprojects.findAll {project -> 
project.path.startsWith(":solr") }) {
   plugins.withType(JavaPlugin) {
     project.ext {
       testOptions += [
-          [propName: 'solr.directoryFactory', value: 
"org.apache.solr.core.MockDirectoryFactory", description: "Solr directory 
factory."],
           [propName: 'tests.src.home', value: null, description: "See 
SOLR-14023."],
           [propName: 'solr.tests.use.numeric.points', value: null, 
description: "Point implementation to use (true=numerics, false=trie)."],
       ]
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml 
b/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml
index c8bb8cf66e3..af4edbddcaf 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml
@@ -19,7 +19,7 @@
 
 <config>
 
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml 
b/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml
index 19d786056ad..bfaf24a0cfa 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml
@@ -19,7 +19,7 @@
 
 <config>
 
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml 
b/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml
index e24df5846fd..70edc2d4723 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml
@@ -20,7 +20,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <indexConfig>
     <useCompoundFile>${unset.sys.property}</useCompoundFile>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml
index 9c2411bde33..502146d9591 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml
@@ -20,7 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <queryParser name="foo" class="FooQParserPlugin"/>
   <!-- override the default "lucene" qparser -->
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
index 34ee4f7d038..d95c8a740c3 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
@@ -24,7 +24,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
 
   <schemaFactory class="ManagedIndexSchemaFactory">
     <bool name="mutable">true</bool>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
index cda45dfe364..b6d4a1cb673 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
@@ -38,7 +38,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}">
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
     <double name="maxWriteMBPerSecDefault">1000000</double>
     <double name="maxWriteMBPerSecFlush">2000000</double>
     <double name="maxWriteMBPerSecMerge">3000000</double>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
index d98ecacf454..d28e6a6d052 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
@@ -23,7 +23,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="/select" class="solr.SearchHandler" />
 </config>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
index d51f8050c56..96e0b6d754c 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
@@ -21,7 +21,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="/select" class="solr.SearchHandler" />
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml
index 3370600574d..038813e8dd3 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml
@@ -24,7 +24,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="solrconfig.snippet.randomindexconfig.xml"/>
   <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   
   <updateHandler class="solr.DirectUpdateHandler2">
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
index 8d242f46a54..d104e8d80af 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
@@ -38,7 +38,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}">
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
     <double name="maxWriteMBPerSecDefault">1000000</double>
     <double name="maxWriteMBPerSecFlush">2000000</double>
     <double name="maxWriteMBPerSecMerge">3000000</double>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
index 6a14a8cc91c..0ca0e186db6 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
@@ -29,7 +29,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
 
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-concurrentmergescheduler.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-concurrentmergescheduler.xml
index 140c4cfeedc..3c7c7959ed0 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-concurrentmergescheduler.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-concurrentmergescheduler.xml
@@ -19,7 +19,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <indexConfig>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-coreproperties.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-coreproperties.xml
index fc707d461fd..13bada25dd7 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-coreproperties.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-coreproperties.xml
@@ -21,7 +21,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
 
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
index cfb812fa25b..7cabbd19c6f 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
@@ -21,7 +21,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
 
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
index 424783beef5..2bd4d26b150 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
@@ -19,7 +19,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateHandler class="solr.DirectUpdateHandler2"/>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
index bb4d3f85ba0..8a57b7fb8e1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
@@ -19,7 +19,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <indexConfig>
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml
index b23a7dc9ff6..9b56a39a52f 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml
@@ -20,7 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}">
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
     <!-- used to keep RAM reqs down for HdfsDirectoryFactory -->
     <bool 
name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</bool>
     <int 
name="solr.hdfs.blockcache.blocksperbank">${solr.hdfs.blockcache.blocksperbank:1024}</int>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
index d814a538a50..63bb8f84ffa 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
@@ -28,7 +28,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
index 0e785ce0adc..5e366166ea1 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
@@ -21,7 +21,7 @@
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}">
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
     <!-- used to keep RAM reqs down for HdfsDirectoryFactory -->
     <bool 
name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</bool>
     <int 
name="solr.hdfs.blockcache.blocksperbank">${solr.hdfs.blockcache.blocksperbank:1024}</int>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower-auth.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower-auth.xml
index 1635cfb099b..236a0997b5a 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower-auth.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower-auth.xml
@@ -19,7 +19,7 @@
 
 <config>
     <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-    <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+    <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
     <schemaFactory class="ClassicIndexSchemaFactory"/>
     <dataDir>${solr.data.dir:}</dataDir>
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower.xml
index fc0298ef5fd..f009ac9e59c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower.xml
@@ -19,7 +19,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <dataDir>${solr.data.dir:}</dataDir>
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower1.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower1.xml
index 71f4157ccb2..9ae3600b200 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower1.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower1.xml
@@ -20,7 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml
index ef0c39ae8e4..2086a6c4ba9 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml
@@ -25,7 +25,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <requestHandler name="/select" class="solr.SearchHandler"/>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml
index 328fc9bd56a..695cd36e2a4 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml
@@ -21,7 +21,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <searchComponent name="componentThatAddsHeader" 
class="org.apache.solr.servlet.ResponseHeaderTest$ComponentThatAddsHeader"/>
   <requestHandler name="/withHeaders" class="solr.SearchHandler">
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml
index c714a4148d7..7688b3e0a7e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml
@@ -25,7 +25,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateHandler class="solr.DirectUpdateHandler2">
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
index b9a72c5634a..072cae1d869 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
@@ -26,7 +26,7 @@
   <dataDir>${solr.data.dir:}</dataDir>
 
   <directoryFactory name="DirectoryFactory"
-                    
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+                    
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <xi:include href="./solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader.xml
index 89c06ad3a54..ea2e8e332da 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader.xml
@@ -19,7 +19,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <dataDir>${solr.data.dir:}</dataDir>
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1-keepOneBackup.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1-keepOneBackup.xml
index 36065b43ae7..40e93b8e5c5 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1-keepOneBackup.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1-keepOneBackup.xml
@@ -19,7 +19,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1.xml
index 4e4e3999224..e4afd9b9f8f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1.xml
@@ -20,7 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader2.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader2.xml
index f6c2a77dde3..933337f0a8c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader2.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader2.xml
@@ -20,7 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader3.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader3.xml
index 49d1ed31b5a..b46fb393cf3 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader3.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader3.xml
@@ -20,7 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-legacy-circuitbreaker.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-legacy-circuitbreaker.xml
index fb00756b86c..275e8961f02 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-legacy-circuitbreaker.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-legacy-circuitbreaker.xml
@@ -21,7 +21,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="/select" class="solr.SearchHandler" />
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml
index 539fd5c4d5c..528ea879568 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml
@@ -19,7 +19,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <indexConfig>
     <!-- set some values to -1 to force the use of internal lucene defaults -->
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-lucene-codec.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-lucene-codec.xml
index 1ee427dc40d..9c131263850 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-lucene-codec.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-lucene-codec.xml
@@ -29,7 +29,7 @@
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <codecFactory class="LuceneDefaultCodecFactory"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="/select" class="solr.SearchHandler" />
 </config>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml
index 666132f8e74..e3f4612e7e1 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml
@@ -22,6 +22,6 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <requestHandler name="/select" class="solr.SearchHandler" />
 </config>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
index 3e0cf1927b6..76684eaebe8 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
@@ -19,7 +19,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <indexConfig>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
index b67d6645f31..d02b9b01827 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
@@ -19,7 +19,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <indexConfig>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml
index b93fabd7c3a..f9276ba9298 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml
@@ -19,7 +19,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <indexConfig>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml
index 9fa236dda0b..0d32632fc94 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml
@@ -38,7 +38,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}">
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
     <double name="maxWriteMBPerSecDefault">1000000</double>
     <double name="maxWriteMBPerSecFlush">2000000</double>
     <double name="maxWriteMBPerSecMerge">3000000</double>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
index fb891f822fd..f4ffe8a8502 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
@@ -24,7 +24,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <dataDir>${solr.data.dir:}</dataDir>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml
index 62fb05b03c4..6e5545be7c4 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml
@@ -19,7 +19,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <indexConfig>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
index e2a20a3379c..1799508b115 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
@@ -22,7 +22,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="/select" class="solr.SearchHandler" />
   <query>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parallel-commit.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parallel-commit.xml
index 3e619948e18..662089c170a 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parallel-commit.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parallel-commit.xml
@@ -24,7 +24,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="solrconfig.snippet.randomindexconfig.xml"/>
   <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   
   <updateHandler class="solr.DirectUpdateHandler2">
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
index a9e71f63ebc..1b41d2b949a 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
@@ -23,7 +23,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="/select" class="solr.SearchHandler"/>
   <initParams name="a" path="/dump3,/dump6,/root/*,/root1/**">
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
index 43f2d285a9f..0416d3e796e 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
@@ -24,7 +24,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateRequestProcessorChain name="parse-date">
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
index 0f79d7c4572..65f1e9f3a4a 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
@@ -22,7 +22,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <dataDir>${solr.data.dir:}</dataDir>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
   
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
index 845998ec2f4..63f2ce29b7e 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
@@ -38,7 +38,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}">
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
     <double name="maxWriteMBPerSecDefault">1000000</double>
     <double name="maxWriteMBPerSecFlush">2000000</double>
     <double name="maxWriteMBPerSecMerge">3000000</double>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
index 52956f60824..4c8d441b2d3 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
@@ -21,7 +21,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="/select" class="solr.SearchHandler" />
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
index eb538fa620b..0dd520baca9 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
@@ -24,7 +24,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <!-- query parser without final NAME field lead to NPE during query parser 
initialization-->
   <queryParser name="fail" class="solr.search.LuceneQParserPlugin"/>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
index 9d4f83d68c3..e6e94a2aa67 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
@@ -23,7 +23,7 @@
     <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   
   <updateHandler class="solr.DirectUpdateHandler2">
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
index 1404f8abb4f..f8bc376ad29 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
@@ -23,7 +23,7 @@
     <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   
   <updateHandler class="solr.DirectUpdateHandler2">
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
index f5571f9827f..b426ac82f93 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
@@ -19,7 +19,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <dataDir>${solr.data.dir:}</dataDir>
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-replication-legacy.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-replication-legacy.xml
index 43c42ffb089..ddd116be38a 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-replication-legacy.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-replication-legacy.xml
@@ -19,7 +19,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <dataDir>${solr.data.dir:}</dataDir>
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
index 643d9a62fc7..f3bb105bd25 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
@@ -31,7 +31,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <searchComponent name="responselog" 
class="org.apache.solr.handler.component.ResponseLogComponent" />
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml
index c71f8baf9d4..ebceb148579 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml
@@ -30,7 +30,7 @@
 
 <config>
 
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
 
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml
index 5920348551a..5d1e7242e70 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml
@@ -19,7 +19,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <indexConfig>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
index 1bb3c97a225..ee27bec6144 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
@@ -23,7 +23,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="/select" class="solr.SearchHandler" />
 
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml
index a3d09a034a5..53cd9fa6c2d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml
@@ -22,7 +22,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="/select" class="solr.SearchHandler" />
   <query>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
index 0a92e46115b..1b3815ff2d5 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
@@ -57,7 +57,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <searchComponent name="spellcheck" 
class="org.apache.solr.handler.component.SpellCheckComponent">
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
index a876fb6f27c..5349edc7c8c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
@@ -21,7 +21,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tagger.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tagger.xml
index c97ce085660..de0b3569270 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tagger.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tagger.xml
@@ -26,7 +26,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
 
   <!-- for postingsFormat="..." -->
   <codecFactory name="CodecFactory" class="solr.SchemaCodecFactory" />
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
index 00d49db3285..1020db8319e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
@@ -25,7 +25,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <!-- see TestConfig.testLib() -->
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml
index 401710e8d32..f9f8427707b 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml
@@ -22,7 +22,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="/select" class="solr.SearchHandler" />
   <queryParser name="testxmlparser" class="XmlQParserPlugin">
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml
index 4d2efd9ec00..8f66b4a5549 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml
@@ -19,7 +19,7 @@
 
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <indexConfig>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml
index ef38e8099e9..b4e4846426d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml
@@ -23,7 +23,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
 <updateRequestProcessorChain name="standard">
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
index e22ad695859..4e6d7bdd370 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
@@ -27,7 +27,7 @@
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
   <requestHandler name="/update" class="solr.UpdateRequestHandler"  />
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateRequestProcessorChain name="comprehensive">
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml
 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml
index 21101b1d9e6..3c6056a3fc1 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml
@@ -22,7 +22,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
   
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml
index 17df214cb71..48f6676645f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml
@@ -21,7 +21,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <xi:include href="foobar-missing.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude";>
     <xi:fallback>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
index 5e6c9c82412..856079f329e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -38,7 +38,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}">
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
     <double name="maxWriteMBPerSecDefault">1000000</double>
     <double name="maxWriteMBPerSecFlush">2000000</double>
     <double name="maxWriteMBPerSecMerge">3000000</double>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml
index 7b0c3e368ba..a971665edee 100644
--- 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml
+++ 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml
@@ -19,7 +19,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="/select" class="solr.SearchHandler"/>
   <codecFactory class="solr.SimpleTextCodecFactory"/>
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml
index ad080961d9f..991d2a50f61 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml
@@ -19,7 +19,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
   <codecFactory class="solr.SchemaCodecFactory">
diff --git 
a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml
index c4a8ae73dfe..94f934dbcbe 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml
@@ -19,7 +19,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
   <codecFactory class="solr.SchemaCodecFactory"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml 
b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
index f2b5ef8a381..0c6b57c4e77 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
@@ -28,7 +28,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateHandler class="solr.DirectUpdateHandler2"/>
diff --git 
a/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml 
b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml
index 3ef080dcca3..c286b018cef 100644
--- 
a/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml
+++ 
b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml
@@ -19,7 +19,7 @@
 
 <config>
 
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 
diff --git 
a/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml 
b/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml
index 853ba656241..baef69fde90 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml
@@ -24,7 +24,7 @@
   <dataDir>${solr.data.dir:}</dataDir>
 
   <directoryFactory name="DirectoryFactory"
-                    
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+                    
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
diff --git 
a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml
 
b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml
index 515ad64d7f5..7e1f3434e96 100644
--- 
a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml
+++ 
b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml
@@ -22,7 +22,7 @@
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}">
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
     <!-- used to keep RAM reqs down for HdfsDirectoryFactory -->
     <bool 
name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</bool>
     <int 
name="solr.hdfs.blockcache.blocksperbank">${solr.hdfs.blockcache.blocksperbank:1024}</int>
diff --git 
a/solr/core/src/test-files/solr/configsets/minimal/conf/solrconfig.xml 
b/solr/core/src/test-files/solr/configsets/minimal/conf/solrconfig.xml
index 346b0448318..4e90243daf6 100644
--- a/solr/core/src/test-files/solr/configsets/minimal/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/minimal/conf/solrconfig.xml
@@ -24,7 +24,7 @@
   <dataDir>${solr.data.dir:}</dataDir>
 
   <directoryFactory name="DirectoryFactory"
-                    
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+                    
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
diff --git 
a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml
 
b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml
index 90c52d71cbe..44ef6530752 100644
--- 
a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml
+++ 
b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml
@@ -23,5 +23,5 @@
     <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
   </indexConfig>
   <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
 </config>
diff --git 
a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-opennlp-extract.xml
 
b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-opennlp-extract.xml
index 7fd793e94d3..1bf101f0db1 100644
--- 
a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-opennlp-extract.xml
+++ 
b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-opennlp-extract.xml
@@ -22,7 +22,7 @@
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
   <requestHandler name="/update" class="solr.UpdateRequestHandler"  />
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateRequestProcessorChain name="extract-single">
diff --git 
a/solr/modules/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml
 
b/solr/modules/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml
index 4c359a67c6a..366e8114e56 100644
--- 
a/solr/modules/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml
+++ 
b/solr/modules/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml
@@ -21,7 +21,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <requestHandler name="/select" class="solr.SearchHandler">
diff --git 
a/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
 
b/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
index 4d268b0efd8..7376c7a07d1 100644
--- 
a/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
+++ 
b/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
@@ -25,7 +25,7 @@
        If replication is in use, this should match the replication 
configuration. -->
   <dataDir>${solr.data.dir:}</dataDir>
 
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <indexConfig>
diff --git 
a/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig-minimal.xml
 
b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig-minimal.xml
index dc3ca73d54d..a39eee3fb9c 100644
--- 
a/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig-minimal.xml
+++ 
b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig-minimal.xml
@@ -24,7 +24,7 @@
   </indexConfig>
 
   <dataDir>${solr.data.dir:}</dataDir>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateHandler class="solr.DirectUpdateHandler2">
diff --git 
a/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
 
b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
index 724b9335b68..159d5e16162 100644
--- 
a/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
+++ 
b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
@@ -27,7 +27,7 @@
        It defaults to "index" if not present, and should probably
        not be changed if replication is in use. -->
   <dataDir>${solr.data.dir:}</dataDir>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateHandler class="solr.DirectUpdateHandler2">
diff --git 
a/solr/modules/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
 
b/solr/modules/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
index f03387a170b..a951ea4d80d 100644
--- 
a/solr/modules/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
+++ 
b/solr/modules/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
@@ -31,7 +31,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
diff --git 
a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml 
b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml
index 1b398597017..c2ae34d1f57 100644
--- a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml
+++ b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml
@@ -14,7 +14,7 @@
     <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
  <dataDir>${solr.data.dir:}</dataDir>
  <directoryFactory name="DirectoryFactory"
-  class="${solr.directoryFactory:solr.RAMDirectoryFactory}" />
+  class="${solr.directoryFactory:solr.MockDirectoryFactory}" />
 
  <!-- for use with the DefaultWrapperModel class -->
  <lib dir="${solr.solr.home:.}/models" />
diff --git 
a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml
 
b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml
index 66bc42f4622..33ace9850d8 100644
--- 
a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml
+++ 
b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml
@@ -14,7 +14,7 @@
     <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
  <dataDir>${solr.data.dir:}</dataDir>
  <directoryFactory name="DirectoryFactory"
-  class="${solr.directoryFactory:solr.RAMDirectoryFactory}" />
+  class="${solr.directoryFactory:solr.MockDirectoryFactory}" />
 
  <schemaFactory class="ClassicIndexSchemaFactory" />
 
diff --git 
a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml 
b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml
index bccfd2bd652..4f1a03a051b 100644
--- 
a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml
+++ 
b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml
@@ -14,7 +14,7 @@
  <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
  <dataDir>${solr.data.dir:}</dataDir>
  <directoryFactory name="DirectoryFactory"
-  class="${solr.directoryFactory:solr.RAMDirectoryFactory}" />
+  class="${solr.directoryFactory:solr.MockDirectoryFactory}" />
 
  <schemaFactory class="ClassicIndexSchemaFactory" />
 
diff --git 
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig-script-updateprocessor.xml
 
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig-script-updateprocessor.xml
index afa5a7c56d7..82ce0331eda 100644
--- 
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig-script-updateprocessor.xml
+++ 
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig-script-updateprocessor.xml
@@ -25,7 +25,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateRequestProcessorChain name="force-script-engine" default="true">
diff --git 
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/stateless-solrconfig-script-updateprocessor.xml
 
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/stateless-solrconfig-script-updateprocessor.xml
index 58fbb862860..d8c6fd2bdbb 100644
--- 
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/stateless-solrconfig-script-updateprocessor.xml
+++ 
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/stateless-solrconfig-script-updateprocessor.xml
@@ -25,7 +25,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateRequestProcessorChain name="force-script-engine" default="true">
diff --git 
a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-follower1.xml
 
b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-follower1.xml
index ab2773d6eb4..43ff0410a8c 100644
--- 
a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-follower1.xml
+++ 
b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-follower1.xml
@@ -23,7 +23,7 @@
     <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
   </indexConfig>
   <dataDir>${solr.data.dir:}</dataDir>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateHandler class="solr.DirectUpdateHandler2">
diff --git 
a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml 
b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml
index 11ea52b8da2..fb89854b08c 100644
--- a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml
@@ -26,7 +26,7 @@
     <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
   </indexConfig>
   <dataDir>${tempDir}/data/${l10n:}-${version:}</dataDir>
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateHandler class="solr.DirectUpdateHandler2">
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java 
b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index bdb2cff914b..34bdcce7e6c 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -760,10 +760,6 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
     log.info("####initCore");
 
     ignoreException("ignore_exception");
-    factoryProp = System.getProperty("solr.directoryFactory");
-    if (factoryProp == null) {
-      System.setProperty("solr.directoryFactory", "solr.RAMDirectoryFactory");
-    }
 
     // other  methods like starting a jetty instance need these too
     System.setProperty("solr.test.sys.prop1", "propone");
diff --git 
a/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml 
b/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml
index 82dca6384d8..ea95918291c 100644
--- a/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -38,7 +38,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.RAMDirectoryFactory}">
+  <directoryFactory name="DirectoryFactory" 
class="${solr.directoryFactory:solr.MockDirectoryFactory}">
     <double name="maxWriteMBPerSecDefault">1000000</double>
     <double name="maxWriteMBPerSecFlush">2000000</double>
     <double name="maxWriteMBPerSecMerge">3000000</double>


Reply via email to