From 767951e5f9743a2425bcdb0079b5e949d524b4e4 Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Tue, 27 Jun 2023 11:28:24 -0400 Subject: [PATCH 1/2] Disable FirestoreIT tests on Dataflow --- runners/google-cloud-dataflow-java/build.gradle | 4 ++++ .../apache/beam/sdk/io/gcp/firestore/it/BaseFirestoreIT.java | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle index a39f05eea5bd..4966b59e8d60 100644 --- a/runners/google-cloud-dataflow-java/build.gradle +++ b/runners/google-cloud-dataflow-java/build.gradle @@ -559,6 +559,8 @@ task googleCloudPlatformLegacyWorkerIntegrationTest(type: Test, dependsOn: copyG exclude '**/PubsubReadIT.class' exclude '**/FhirIOReadIT.class' exclude '**/gcp/spanner/changestreams/it/*.class' + // TODO(https://github.com/apache/beam/issues/25851) failing due to internal Firestore breaking change + exclude '**/FirestoreV1IT.class' maxParallelForks 4 classpath = configurations.googleCloudPlatformIntegrationTest testClassesDirs = files(project(":sdks:java:io:google-cloud-platform").sourceSets.test.output.classesDirs) @@ -606,6 +608,8 @@ task googleCloudPlatformRunnerV2IntegrationTest(type: Test) { exclude '**/FhirIOLROIT.class' exclude '**/FhirIOSearchIT.class' exclude '**/FhirIOPatientEverythingIT.class' + // TODO(https://github.com/apache/beam/issues/25851) failing due to internal Firestore breaking change + exclude '**/FirestoreV1IT.class' maxParallelForks 4 classpath = configurations.googleCloudPlatformIntegrationTest diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/it/BaseFirestoreIT.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/it/BaseFirestoreIT.java index 551d4e3d7a87..550dc9e3907b 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/it/BaseFirestoreIT.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/it/BaseFirestoreIT.java @@ -186,8 +186,6 @@ public final void listCollections() throws Exception { } @Test - @Ignore( - "https://github.com/apache/beam/issues/25851 failing due to internal Firestore breaking change") public final void listDocuments() throws Exception { DocumentGenerator documentGenerator = helper.documentGenerator(NUM_ITEMS_TO_GENERATE, "a"); Instant readTime = From b85d7a63c5069b561a0c1ab40f7220e3be39402f Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Tue, 27 Jun 2023 12:38:13 -0400 Subject: [PATCH 2/2] Fix spotless --- .../org/apache/beam/sdk/io/gcp/firestore/it/BaseFirestoreIT.java | 1 - 1 file changed, 1 deletion(-) diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/it/BaseFirestoreIT.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/it/BaseFirestoreIT.java index 550dc9e3907b..b6f1c93959e1 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/it/BaseFirestoreIT.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/it/BaseFirestoreIT.java @@ -59,7 +59,6 @@ import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.MoreExecutors; import org.joda.time.Instant; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName;