From 9d95494debc1e90f593d12a262f4c1964122eb4f Mon Sep 17 00:00:00 2001 From: aksharauke <126752897+aksharauke@users.noreply.github.com> Date: Fri, 11 Oct 2024 09:41:08 +0530 Subject: [PATCH] It (#1926) * testing the flaky it * corrected the notification prefix * corrected the notification prefix --- .../v2/templates/SpannerToSourceDbCustomShardIT.java | 2 +- .../teleport/v2/templates/SpannerToSourceDbDatatypeIT.java | 2 +- .../cloud/teleport/v2/templates/SpannerToSourceDbIT.java | 2 +- .../cloud/teleport/v2/templates/SpannerToSourceDbITBase.java | 2 +- .../templates/SpannerToSourceDbInterleaveMultiShardIT.java | 2 +- .../cloud/teleport/v2/templates/SpannerToSourceDbLTBase.java | 5 +++-- .../teleport/v2/templates/SpannerToSourceDbTimezoneIT.java | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCustomShardIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCustomShardIT.java index e638f6bc3b..6f56432066 100644 --- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCustomShardIT.java +++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCustomShardIT.java @@ -112,7 +112,7 @@ public void setUp() throws IOException, InterruptedException { createPubsubResources( getClass().getSimpleName(), pubsubResourceManager, - getGcsPath("dlq", gcsResourceManager)); + getGcsPath("dlq", gcsResourceManager).replace("gs://" + artifactBucketName, "")); jobInfo = launchDataflowJob( gcsResourceManager, diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbDatatypeIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbDatatypeIT.java index 9d301f0ff5..710526fb5a 100644 --- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbDatatypeIT.java +++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbDatatypeIT.java @@ -107,7 +107,7 @@ public void setUp() throws IOException { createPubsubResources( getClass().getSimpleName(), pubsubResourceManager, - getGcsPath("dlq", gcsResourceManager)); + getGcsPath("dlq", gcsResourceManager).replace("gs://" + artifactBucketName, "")); jobInfo = launchDataflowJob( gcsResourceManager, diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbIT.java index db05d720ec..2a424d30eb 100644 --- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbIT.java +++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbIT.java @@ -100,7 +100,7 @@ public void setUp() throws IOException { createPubsubResources( getClass().getSimpleName(), pubsubResourceManager, - getGcsPath("dlq", gcsResourceManager)); + getGcsPath("dlq", gcsResourceManager).replace("gs://" + artifactBucketName, "")); jobInfo = launchDataflowJob( gcsResourceManager, diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbITBase.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbITBase.java index 38e5c006de..781b4c4a2e 100644 --- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbITBase.java +++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbITBase.java @@ -91,7 +91,7 @@ public SubscriptionName createPubsubResources( if (prefix.startsWith("/")) { prefix = prefix.substring(1); } - prefix += "/retry"; + prefix += "/retry/"; gcsClient.createNotification(topic.toString(), prefix); return subscription; } diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbInterleaveMultiShardIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbInterleaveMultiShardIT.java index 07f72df5dd..25a1b1b991 100644 --- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbInterleaveMultiShardIT.java +++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbInterleaveMultiShardIT.java @@ -112,7 +112,7 @@ public void setUp() throws IOException { createPubsubResources( getClass().getSimpleName(), pubsubResourceManager, - getGcsPath("dlq", gcsResourceManager)); + getGcsPath("dlq", gcsResourceManager).replace("gs://" + artifactBucketName, "")); jobInfo = launchDataflowJob( diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbLTBase.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbLTBase.java index e1483bd5d2..054b13b1b3 100644 --- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbLTBase.java +++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbLTBase.java @@ -79,7 +79,8 @@ public void setupResourceManagers( createPubsubResources( getClass().getSimpleName(), pubsubResourceManager, - getGcsPath(artifactBucket, "dlq", gcsResourceManager)); + getGcsPath(artifactBucket, "dlq", gcsResourceManager) + .replace("gs://" + artifactBucket, "")); } public void setupMySQLResourceManager(int numShards) throws IOException { @@ -117,7 +118,7 @@ public SubscriptionName createPubsubResources( if (prefix.startsWith("/")) { prefix = prefix.substring(1); } - prefix += "/retry"; + prefix += "/retry/"; gcsResourceManager.createNotification(topic.toString(), prefix); return subscription; } diff --git a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbTimezoneIT.java b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbTimezoneIT.java index 04b324b09a..c8c3ce5945 100644 --- a/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbTimezoneIT.java +++ b/v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbTimezoneIT.java @@ -102,7 +102,7 @@ public void setUp() throws IOException { createPubsubResources( getClass().getSimpleName(), pubsubResourceManager, - getGcsPath("dlq", gcsResourceManager)); + getGcsPath("dlq", gcsResourceManager).replace("gs://" + artifactBucketName, "")); jobInfo = launchDataflowJob( gcsResourceManager,