(solr) branch main updated: Fix TestReplicationHandler (#3142)

[houston]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new a5b0b98a795 Fix TestReplicationHandler (#3142)
a5b0b98a795 is described below

commit a5b0b98a79559021e44d00b43fff6c020c54f829
Author: Houston Putman <hous...@apache.org>
AuthorDate: Wed Jan 29 12:45:07 2025 -0600

    Fix TestReplicationHandler (#3142)
    
    Addresses a combination of SOLR-17306 and SOLR-17548.
---
 solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java | 4 +++-
 .../core/src/test/org/apache/solr/handler/TestReplicationHandler.java | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java 
b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java
index 2efe775a58d..deba80bece7 100644
--- a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java
+++ b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java
@@ -27,6 +27,7 @@ import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
@@ -56,7 +57,8 @@ public final class ReplicationTestHelper {
   public static JettySolrRunner createAndStartJetty(SolrInstance instance) 
throws Exception {
     Files.copy(
         Path.of(SolrTestCaseJ4.TEST_HOME(), "solr.xml"),
-        Path.of(instance.getHomeDir(), "solr.xml"));
+        Path.of(instance.getHomeDir(), "solr.xml"),
+        StandardCopyOption.REPLACE_EXISTING);
     Properties nodeProperties = new Properties();
     nodeProperties.setProperty("solr.data.dir", instance.getDataDir());
     JettyConfig jettyConfig = JettyConfig.builder().setPort(0).build();
diff --git 
a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java 
b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
index a467010ca5e..800e172d98a 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
@@ -70,7 +70,6 @@ import org.apache.solr.core.CachingDirectoryFactory;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.core.StandardDirectoryFactory;
-import org.apache.solr.core.snapshots.SolrSnapshotMetaDataManager;
 import org.apache.solr.embedded.JettySolrRunner;
 import org.apache.solr.handler.admin.api.ReplicationAPIBase;
 import org.apache.solr.security.AllowListUrlChecker;
@@ -1037,8 +1036,7 @@ public class TestReplicationHandler extends 
SolrTestCaseJ4 {
                   @Override
                   public boolean accept(File dir, String name) {
                     File f = new File(dir, name);
-                    return f.isDirectory()
-                        && 
!SolrSnapshotMetaDataManager.SNAPSHOT_METADATA_DIR.equals(name);
+                    return f.isDirectory() && !name.startsWith("snapshot");
                   }
                 });
     return list.length;