It (#1926)

* testing the flaky it * corrected the notification prefix * corrected the notification prefix
GoogleCloudPlatform · Oct 11, 2024 · 9d95494 · 9d95494
1 parent 8c035b9
commit 9d95494
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/.../src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbCustomShardIT.java b/.../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/...edb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbDatatypeIT.java b/...edb/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/...to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbIT.java b/...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/...ourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbITBase.java b/...ourcedb/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/.../java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbInterleaveMultiShardIT.java b/.../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/...ourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbLTBase.java b/...ourcedb/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/...edb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbTimezoneIT.java b/...edb/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,