Spring/spring-pulsar
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix PulsarFunctionAdministration IT (#352)

Browse Source 
* Enable the IT run on CI-PR workflow

* Add Junit5 TestWatcher to log the Pulsar
  container logs on test failure
This commit is contained in:
Chris Bono
2023-02-16 21:01:11 -06:00
committed by GitHub
parent 50802c7393
commit 3476bbf4e7
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci-pr.yml vendored
View File

@@ -36,7 +36,7 @@ jobs:
- name: Run Gradle build
run: |
./gradlew clean build -DdownloadRabbitConnector=false --continue --scan
./gradlew clean build -DdownloadRabbitConnector=true --continue --scan
- name: Capture Test Results
if: failure()

30
spring-pulsar-spring-boot-autoconfigure/src/test/java/org/springframework/pulsar/autoconfigure/PulsarFunctionAdministrationIntegrationTests.java
View File

@@ -40,6 +40,9 @@ import org.apache.pulsar.common.policies.data.SourceStatus;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.TestWatcher;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.PulsarContainer;
@@ -57,8 +60,10 @@ import org.springframework.context.annotation.Import;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.ResourcePatternUtils;
import org.springframework.core.log.LogAccessor;
import org.springframework.lang.Nullable;
import org.springframework.pulsar.annotation.PulsarListener;
import org.springframework.pulsar.autoconfigure.PulsarFunctionAdministrationIntegrationTests.ContainerLoggingTestWatcher;
import org.springframework.pulsar.function.PulsarFunctionAdministration;
import org.springframework.pulsar.function.PulsarFunctionOperations.FunctionStopPolicy;
import org.springframework.pulsar.function.PulsarSource;
@@ -73,6 +78,7 @@ import org.springframework.pulsar.test.support.PulsarTestContainerSupport;
*/
@Testcontainers(disabledWithoutDocker = true)
@EnabledIf("rabbitConnectorExists")
@ExtendWith(ContainerLoggingTestWatcher.class)
class PulsarFunctionAdministrationIntegrationTests {
private static final String RABBIT_QUEUE = "pft_foo_queue";
@@ -129,6 +135,7 @@ class PulsarFunctionAdministrationIntegrationTests {
List<String> messages = LongStream.range(0, RECEIVED_MESSAGE_LATCH.getCount()).mapToObj((i) -> "bar" + i)
.toList();
messages.forEach(msg -> rabbitTemplate.convertAndSend(RABBIT_QUEUE, msg));
assertThat(RECEIVED_MESSAGE_LATCH.await(10, TimeUnit.SECONDS)).isTrue();
assertThat(RECEIVED_MESSAGES).containsExactlyElementsOf(messages);
}
@@ -259,4 +266,27 @@ class PulsarFunctionAdministrationIntegrationTests {
}
static class ContainerLoggingTestWatcher implements TestWatcher {
private final LogAccessor logger = new LogAccessor(this.getClass());
@Override
public void testFailed(ExtensionContext context, Throwable cause) {
this.logger.error(() -> "Test %s failed due to: %s - inspect container logs below:%n%n%s"
.formatted(context.getDisplayName(), cause.getMessage(), getPulsarContainerLogs()));
}
private String getPulsarContainerLogs() {
try {
return PULSAR_CONTAINER.getLogs();
}
catch (Exception ex) {
String msg = "<---- Failed to retrieve container logs: %s ---->".formatted(ex.getMessage());
logger.error(ex, msg);
return msg;
}
}
}
}