Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit b90a971

Browse files
committed
TaskLauncer IT/AT conditional on SCDF version
1 parent 794ee9b commit b90a971

File tree

1 file changed

+12
-3
lines changed
  • spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test

1 file changed

+12
-3
lines changed

spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/DataFlowIT.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -758,13 +758,22 @@ public void namedChannelDirectedGraph() {
758758

759759
@Test
760760
public void dataflowTaskLauncherSink() {
761+
761762
String dataflowTaskLauncherAppName = "dataflow-tasklauncher";
762-
String skipLogMessage = dataflowTaskLauncherAppName + "-sink-test: SKIP - no " + dataflowTaskLauncherAppName + " app registered!";
763+
764+
String skipOnIncompatibleDataFlowVersion = dataflowTaskLauncherAppName + "-sink-test: SKIP - Dataflow version:"
765+
+ runtimeApps.getDataflowServerVersion() + " is older than 2.9.0-SNAPSHOT!";
766+
if (!runtimeApps.dataflowServerVersionEqualOrGreaterThan("2.9.0-SNAPSHOT")) {
767+
logger.info(skipOnIncompatibleDataFlowVersion);
768+
}
769+
Assumptions.assumeTrue(runtimeApps.dataflowServerVersionEqualOrGreaterThan("2.9.0-SNAPSHOT"), skipOnIncompatibleDataFlowVersion);
770+
771+
String skipOnMissingAppRegistration = dataflowTaskLauncherAppName + "-sink-test: SKIP - no " + dataflowTaskLauncherAppName + " app registered!";
763772
boolean isDataflowTaskLauncherAppRegistered = runtimeApps.isAppRegistered(dataflowTaskLauncherAppName, ApplicationType.sink);
764773
if (!isDataflowTaskLauncherAppRegistered) {
765-
logger.info(skipLogMessage);
774+
logger.info(skipOnMissingAppRegistration);
766775
}
767-
Assumptions.assumeTrue(isDataflowTaskLauncherAppRegistered, skipLogMessage);
776+
Assumptions.assumeTrue(isDataflowTaskLauncherAppRegistered, skipOnMissingAppRegistration);
768777

769778
DetailedAppRegistrationResource dataflowTaskLauncherRegistration =
770779
dataFlowOperations.appRegistryOperations().info(dataflowTaskLauncherAppName, ApplicationType.sink, false);

0 commit comments

Comments
 (0)