Fixing IpinfoIpDataLookupsTests for Windows (#114340)

Author: masseyke

modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/IpinfoIpDataLookupsTests.java

@@ -13,9 +13,11 @@
 import com.maxmind.db.Networks;
 import com.maxmind.db.Reader;
 
+import org.apache.lucene.util.Constants;
 import org.elasticsearch.common.network.NetworkAddress;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.set.Sets;
+import org.elasticsearch.core.IOUtils;
 import org.elasticsearch.core.SuppressForbidden;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.test.ESTestCase;
@@ -48,17 +50,22 @@ public class IpinfoIpDataLookupsTests extends ESTestCase {
     private ThreadPool threadPool;
     private ResourceWatcherService resourceWatcherService;
 
+    // a temporary directory that mmdb files can be copied to and read from
+    private Path tmpDir;
+
     @Before
     public void setup() {
         threadPool = new TestThreadPool(ConfigDatabases.class.getSimpleName());
         Settings settings = Settings.builder().put("resource.reload.interval.high", TimeValue.timeValueMillis(100)).build();
         resourceWatcherService = new ResourceWatcherService(settings, threadPool);
+        tmpDir = createTempDir();
     }
 
     @After
-    public void cleanup() {
+    public void cleanup() throws IOException {
         resourceWatcherService.close();
         threadPool.shutdownNow();
+        IOUtils.rm(tmpDir);
     }
 
     public void testDatabasePropertyInvariants() {
@@ -82,7 +89,8 @@ public void testParseAsn() {
     }
 
     public void testAsn() throws IOException {
-        Path configDir = createTempDir();
+        assumeFalse("https://github.com/elastic/elasticsearch/issues/114266", Constants.WINDOWS);
+        Path configDir = tmpDir;
         copyDatabase("ipinfo/ip_asn_sample.mmdb", configDir.resolve("ip_asn_sample.mmdb"));
         copyDatabase("ipinfo/asn_sample.mmdb", configDir.resolve("asn_sample.mmdb"));
 
@@ -91,8 +99,7 @@ public void testAsn() throws IOException {
         configDatabases.initialize(resourceWatcherService);
 
         // this is the 'free' ASN database (sample)
-        {
-            DatabaseReaderLazyLoader loader = configDatabases.getDatabase("ip_asn_sample.mmdb");
+        try (DatabaseReaderLazyLoader loader = configDatabases.getDatabase("ip_asn_sample.mmdb")) {
             IpDataLookup lookup = new IpinfoIpDataLookups.Asn(Set.of(Database.Property.values()));
             Map<String, Object> data = lookup.getData(loader, "5.182.109.0");
             assertThat(
@@ -110,8 +117,7 @@ public void testAsn() throws IOException {
         }
 
         // this is the non-free or 'standard' ASN database (sample)
-        {
-            DatabaseReaderLazyLoader loader = configDatabases.getDatabase("asn_sample.mmdb");
+        try (DatabaseReaderLazyLoader loader = configDatabases.getDatabase("asn_sample.mmdb")) {
             IpDataLookup lookup = new IpinfoIpDataLookups.Asn(Set.of(Database.Property.values()));
             Map<String, Object> data = lookup.getData(loader, "23.53.116.0");
             assertThat(
@@ -132,7 +138,8 @@ public void testAsn() throws IOException {
     }
 
     public void testAsnInvariants() {
-        Path configDir = createTempDir();
+        assumeFalse("https://github.com/elastic/elasticsearch/issues/114266", Constants.WINDOWS);
+        Path configDir = tmpDir;
         copyDatabase("ipinfo/ip_asn_sample.mmdb", configDir.resolve("ip_asn_sample.mmdb"));
         copyDatabase("ipinfo/asn_sample.mmdb", configDir.resolve("asn_sample.mmdb"));
 
@@ -168,16 +175,16 @@ public void testAsnInvariants() {
     }
 
     public void testCountry() throws IOException {
-        Path configDir = createTempDir();
+        assumeFalse("https://github.com/elastic/elasticsearch/issues/114266", Constants.WINDOWS);
+        Path configDir = tmpDir;
         copyDatabase("ipinfo/ip_country_sample.mmdb", configDir.resolve("ip_country_sample.mmdb"));
 
         GeoIpCache cache = new GeoIpCache(1000); // real cache to test purging of entries upon a reload
         ConfigDatabases configDatabases = new ConfigDatabases(configDir, cache);
         configDatabases.initialize(resourceWatcherService);
 
         // this is the 'free' Country database (sample)
-        {
-            DatabaseReaderLazyLoader loader = configDatabases.getDatabase("ip_country_sample.mmdb");
+        try (DatabaseReaderLazyLoader loader = configDatabases.getDatabase("ip_country_sample.mmdb")) {
             IpDataLookup lookup = new IpinfoIpDataLookups.Country(Set.of(Database.Property.values()));
             Map<String, Object> data = lookup.getData(loader, "4.221.143.168");
             assertThat(

muted-tests.yml

@@ -362,8 +362,6 @@ tests:
 - class: org.elasticsearch.xpack.inference.services.openai.OpenAiServiceTests
   method: testInfer_StreamRequest
   issue: https://github.com/elastic/elasticsearch/issues/114232
-- class: org.elasticsearch.ingest.geoip.IpinfoIpDataLookupsTests
-  issue: https://github.com/elastic/elasticsearch/issues/114266
 - class: org.elasticsearch.index.SearchSlowLogTests
   method: testLevelPrecedence
   issue: https://github.com/elastic/elasticsearch/issues/114300