From d74404ff3c3cc12d34314878d625df0866906ec8 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Wed, 18 Jan 2023 17:44:49 -0600 Subject: [PATCH] Fix pulsar functions IT - Does not fail when `/connectors` not available --- ...unctionAdministrationIntegrationTests.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/spring-pulsar-spring-boot-autoconfigure/src/test/java/org/springframework/pulsar/autoconfigure/PulsarFunctionAdministrationIntegrationTests.java b/spring-pulsar-spring-boot-autoconfigure/src/test/java/org/springframework/pulsar/autoconfigure/PulsarFunctionAdministrationIntegrationTests.java index c0b4347e..c3be8aba 100644 --- a/spring-pulsar-spring-boot-autoconfigure/src/test/java/org/springframework/pulsar/autoconfigure/PulsarFunctionAdministrationIntegrationTests.java +++ b/spring-pulsar-spring-boot-autoconfigure/src/test/java/org/springframework/pulsar/autoconfigure/PulsarFunctionAdministrationIntegrationTests.java @@ -79,17 +79,26 @@ class PulsarFunctionAdministrationIntegrationTests { private static final String PULSAR_TOPIC = "pft_foo-topic"; private static final PulsarContainer PULSAR_CONTAINER = new PulsarContainer( - PulsarTestContainerSupport.getPulsarImage()).withFunctionsWorker() - .withClasspathResourceMapping("/connectors/", "/pulsar/connectors", BindMode.READ_ONLY); + PulsarTestContainerSupport.getPulsarImage()); - private static final RabbitMQContainer RABBITMQ_CONTAINER = new RabbitMQContainer("rabbitmq") - .withNetworkAliases("rabbitmq").withExposedPorts(5672, 15672).withStartupTimeout(Duration.ofMinutes(1)); + private static final RabbitMQContainer RABBITMQ_CONTAINER = new RabbitMQContainer("rabbitmq"); @BeforeAll static void startContainers() { Network sharedNetwork = Network.newNetwork(); - PULSAR_CONTAINER.withNetwork(sharedNetwork).start(); - RABBITMQ_CONTAINER.withNetwork(sharedNetwork).start(); + // @formatter:off + PULSAR_CONTAINER + .withNetwork(sharedNetwork) + .withFunctionsWorker() + .withClasspathResourceMapping("/connectors/", "/pulsar/connectors", BindMode.READ_ONLY) + .start(); + RABBITMQ_CONTAINER + .withNetwork(sharedNetwork) + .withNetworkAliases("rabbitmq") + .withExposedPorts(5672, 15672) + .withStartupTimeout(Duration.ofMinutes(1)) + .start(); + // @formatter:on } private static final CountDownLatch RECEIVED_MESSAGE_LATCH = new CountDownLatch(10);