[tika] branch main updated: try to make flaky test less likely to be flaky

[tallison]

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

tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/main by this push:
     new b3b3612  try to make flaky test less likely to be flaky
b3b3612 is described below

commit b3b36124fdacd7a3a97711f1ff1b1ff92b649080
Author: tallison <talli...@apache.org>
AuthorDate: Mon Dec 13 14:46:05 2021 -0500

    try to make flaky test less likely to be flaky
---
 .../org/apache/tika/pipes/solr/tests/TikaPipesSolrTestBase.java    | 7 ++++---
 .../src/test/resources/tika-config-solr-urls.xml                   | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolrTestBase.java
 
b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolrTestBase.java
index e99ac70..12a234f 100644
--- 
a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolrTestBase.java
+++ 
b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolrTestBase.java
@@ -30,6 +30,7 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.impl.LBHttpSolrClient;
+import org.apache.solr.client.solrj.response.UpdateResponse;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.tika.cli.TikaCLI;
 import org.apache.tika.pipes.HandlerConfig;
@@ -121,7 +122,7 @@ public abstract class TikaPipesSolrTestBase {
             embeddedDoc.setField("id", filename);
             embeddedDoc.setField("path", filename);
             solrClient.add(collection, embeddedDoc);
-            solrClient.commit(collection);
+            solrClient.commit(collection, true, true);
         }
     }
 
@@ -170,7 +171,7 @@ public abstract class TikaPipesSolrTestBase {
 
         try (SolrClient solrClient = new 
LBHttpSolrClient.Builder().withBaseSolrUrls(solrEndpoint)
                 .build()) {
-            solrClient.commit(collection);
+            solrClient.commit(collection, true, true);
             Assert.assertEquals(numDocs, solrClient
                     .query(collection, new SolrQuery("mime_s:\"text/html; 
charset=ISO-8859-1\""))
                     .getResults().getNumFound());
@@ -205,7 +206,7 @@ public abstract class TikaPipesSolrTestBase {
 
         try (SolrClient solrClient = new 
LBHttpSolrClient.Builder().withBaseSolrUrls(solrEndpoint)
                 .build()) {
-            solrClient.commit(collection);
+            solrClient.commit(collection, true, true);
             Assert.assertEquals(numDocs, solrClient
                     .query(collection, new SolrQuery("mime_s:\"text/html; 
charset=ISO-8859-1\""))
                     .getResults().getNumFound());
diff --git 
a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-config-solr-urls.xml
 
b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-config-solr-urls.xml
index 7517a9c..fc76293 100644
--- 
a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-config-solr-urls.xml
+++ 
b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-config-solr-urls.xml
@@ -68,7 +68,7 @@
     <params>
       <maxForEmitBatchBytes>10000</maxForEmitBatchBytes>
       <emitMaxEstimatedBytes>100000</emitMaxEstimatedBytes>
-      <emitWithinMillis>60000</emitWithinMillis>
+      <emitWithinMillis>10</emitWithinMillis>
       <numEmitters>1</numEmitters>
       <numClients>1</numClients>
       <tikaConfig>{TIKA_CONFIG}</tikaConfig>
@@ -97,7 +97,7 @@
         <updateStrategy>{UPDATE_STRATEGY}</updateStrategy>
         <solrCollection>testcol</solrCollection>
         <attachmentStrategy>{ATTACHMENT_STRATEGY}</attachmentStrategy>
-        <commitWithin>10</commitWithin>
+        <commitWithin>1</commitWithin>
         <idField>id</idField>
         <connectionTimeout>10000</connectionTimeout>
         <socketTimeout>60000</socketTimeout>
@@ -119,7 +119,7 @@
       <failCountField>fail_count_i</failCountField>
       <sizeFieldName>size_i</sizeFieldName>
       <parseMode>{PARSE_MODE}</parseMode>
-      <rows>10</rows>
+      <rows>100</rows>
       <fetcherName>fsf</fetcherName>
       <emitterName>se</emitterName>
     </params>