TIKA-4155, try again...

apache · Oct 16, 2023 · a427bac · a427bac
1 parent b202275
commit a427bac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/...n-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java b/...n-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java
@@ -31,14 +31,23 @@
 @Testcontainers(disabledWithoutDocker = true)
 public class TikaPipesOpenSearchTest extends TikaPipesXSearchBase {
 
-    private static final String DOCKER_IMAGE_NAME = "opensearchproject/opensearch:2.8.0";
+    private static final String DOCKER_IMAGE_NAME = "opensearchproject/opensearch:2.10.0";
 
+    private static long MEMORY_IN_BYTES = 4l * 1024l * 1024l * 1024l;
+
+    private static long MEMORY_SWAP_IN_BYTES = 64l * 1024l * 1024l * 1024l;
     @Container
     public static GenericContainer<?> OPEN_SEARCH_CONTAINER =
             new GenericContainer<>(DockerImageName.parse(DOCKER_IMAGE_NAME))
                     .withExposedPorts(9200)
                     .withStartupTimeout(Duration.of(180, ChronoUnit.SECONDS))
-                    .withEnv("discovery.type", "single-node");
+                    .withEnv("discovery.type", "single-node")
+                    .withCreateContainerCmdModifier( cmd -> {
+                        cmd.getHostConfig()
+                                .withMemory(MEMORY_IN_BYTES)
+                                .withMemorySwap(MEMORY_SWAP_IN_BYTES);
+                    });;
+
 
 
     @BeforeEach

diff --git a/...gration-tests/src/test/java/org/apache/tika/pipes/xsearch/tests/TikaPipesXSearchBase.java b/...gration-tests/src/test/java/org/apache/tika/pipes/xsearch/tests/TikaPipesXSearchBase.java
@@ -80,6 +80,8 @@ public void tearDown() throws Exception {
         JsonResponse response = CLIENT.deleteIndex(OPEN_SEARCH_ENDPOINT_BASE + TEST_INDEX);
         assertEquals(200, response.getStatus());
         assertTrue(response.getJson().get("acknowledged").asBoolean());
+        //refresh to hope that the underlying index is actually deleted
+        JsonResponse refresh = CLIENT.getJson(OPEN_SEARCH_ENDPOINT_BASE + TEST_INDEX + "/_refresh");
     }
 
     @Test