From dac22b2695943499b3f373c093b8b75c49dd19e3 Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Thu, 12 Dec 2024 23:05:57 +0200 Subject: [PATCH] Disable Postgres backward compat migration IT Marks the `AbstractPostgresDatabaseTests` with `@Disabled` as we can not easily test backwards compatibility between `2.11.x` and `3.0.0` because the `3.x` dataflow client does not work with `2.11.x` server. As such, we will re-enable the test once `3.1.0` is released. --- .../test/db/AbstractPostgresDatabaseTests.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/db/AbstractPostgresDatabaseTests.java b/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/db/AbstractPostgresDatabaseTests.java index eb1a6ac1f7..8cd8c03ed8 100644 --- a/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/db/AbstractPostgresDatabaseTests.java +++ b/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/db/AbstractPostgresDatabaseTests.java @@ -20,6 +20,7 @@ import java.net.URISyntaxException; import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -79,15 +80,16 @@ public void migrationError() { @SuppressWarnings("deprecation") @Test @DataflowMain - public void migration210211() throws URISyntaxException { + @Disabled("Reactivate when 3.1 is released") + public void migration30_31() throws URISyntaxException { log.info("Running testMigrationError()"); this.dataflowCluster.startSkipperDatabase(getDatabaseTag()); this.dataflowCluster.startDataflowDatabase(getDatabaseTag()); - this.dataflowCluster.startSkipper(TagNames.SKIPPER_2_9); + this.dataflowCluster.startSkipper(TagNames.SKIPPER_3_0); assertSkipperServerRunning(this.dataflowCluster); - this.dataflowCluster.startDataflow(TagNames.DATAFLOW_2_10); + this.dataflowCluster.startDataflow(TagNames.DATAFLOW_3_0); assertDataflowServerRunning(this.dataflowCluster); ObjectMapper objectMapper = new ObjectMapper();