From e778f261ad0accdd7bcc5961ac434c3a75274937 Mon Sep 17 00:00:00 2001
From: "Chris M. Hostetter" <hossman@apache.org>
Date: Tue, 6 Aug 2013 21:43:54 +0000
Subject: [PATCH] SOLR-4952: TestSolrDeletionPolicy1 can't directly use
 solrconfig.snippet.randomindexconfig.xml - but it can leverage the random sys
 props directly

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1511128 13f79535-47bb-0310-9956-ffa450edef68
---
 .../conf/solrconfig-delpolicy1.xml            | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

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 80a11363b8f..5cd0e7edf1a 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
@@ -25,12 +25,27 @@
   <requestHandler name="standard" class="solr.StandardRequestHandler"/>
 
   <indexConfig>
-   <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
-   <deletionPolicy class="solr.SolrDeletionPolicy">
-    <str name="keepOptimizedOnly">true</str>
-    <str name="maxCommitsToKeep">3</str>
-    <str name="maxCommitAge">100MILLISECONDS</str>
-   </deletionPolicy>
+    <!-- we can't include solrconfig.snippet.randomindexconfig.xml because we need
+         to configure an explicit deletion policy, but we still wnat to randomize as much 
+         as possible. 
+    -->
+    <mergePolicy class="${solr.tests.mergePolicy:org.apache.solr.util.RandomMergePolicy}" />
+    <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
+
+    <maxBufferedDocs>${solr.tests.maxBufferedDocs}</maxBufferedDocs>
+    <maxIndexingThreads>${solr.tests.maxIndexingThreads}</maxIndexingThreads>
+    <ramBufferSizeMB>${solr.tests.ramBufferSizeMB}</ramBufferSizeMB>
+    
+    <mergeScheduler class="${solr.tests.mergeScheduler}" />
+    
+    <lockType>single</lockType>
+
+
+    <deletionPolicy class="solr.SolrDeletionPolicy">
+      <str name="keepOptimizedOnly">true</str>
+      <str name="maxCommitsToKeep">3</str>
+      <str name="maxCommitAge">100MILLISECONDS</str>
+    </deletionPolicy>
   </indexConfig>
 
 </config>