This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch branch_2x in repository https://gitbox.apache.org/repos/asf/tika.git
commit a427bac15d2ec5f56ddea84025c992347083360f Author: tallison <[email protected]> AuthorDate: Mon Oct 16 10:13:23 2023 -0400 TIKA-4155, try again... --- .../pipes/opensearch/tests/TikaPipesOpenSearchTest.java | 13 +++++++++++-- .../tika/pipes/xsearch/tests/TikaPipesXSearchBase.java | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java index b6982a9b3..b6e74e0b0 100644 --- a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java +++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java @@ -31,14 +31,23 @@ import org.apache.tika.pipes.xsearch.tests.TikaPipesXSearchBase; @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/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/xsearch/tests/TikaPipesXSearchBase.java b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/xsearch/tests/TikaPipesXSearchBase.java index 7416083ab..229301f37 100644 --- a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/xsearch/tests/TikaPipesXSearchBase.java +++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/xsearch/tests/TikaPipesXSearchBase.java @@ -80,6 +80,8 @@ public abstract class TikaPipesXSearchBase { 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
