[BEAM-12572] Fix PipelineOptions, skip tests for specific runners

twosom · Jan 26, 2022 · a57cf9c · a57cf9c
1 parent 0622d4a
commit a57cf9c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/examples/java/src/test/java/org/apache/beam/examples/cookbook/CombinePerKeyExamplesIT.java b/examples/java/src/test/java/org/apache/beam/examples/cookbook/CombinePerKeyExamplesIT.java
@@ -23,7 +23,6 @@
 import com.google.api.client.util.BackOffUtils;
 import com.google.api.client.util.Sleeper;
 import com.google.api.services.bigquery.model.QueryResponse;
-import org.apache.beam.examples.complete.TrafficRoutes;
 import org.apache.beam.sdk.extensions.gcp.options.GcpOptions;
 import org.apache.beam.sdk.extensions.gcp.util.BackOffAdapter;
 import org.apache.beam.sdk.io.gcp.testing.BigqueryClient;
@@ -53,7 +52,7 @@ public interface CombinePerKeyExamplesOptions
 
   @Before
   public void setupTestEnvironment() throws Exception {
-    PipelineOptionsFactory.register(TrafficRoutes.TrafficRoutesOptions.class);
+    PipelineOptionsFactory.register(CombinePerKeyExamplesOptions.class);
     this.options = TestPipeline.testingPipelineOptions().as(CombinePerKeyExamplesOptions.class);
     this.projectId = TestPipeline.testingPipelineOptions().as(GcpOptions.class).getProject();
     this.bqClient = new BigqueryClient("CombinePerKeyExamplesIT");

diff --git a/examples/java/src/test/java/org/apache/beam/examples/cookbook/FilterExamplesIT.java b/examples/java/src/test/java/org/apache/beam/examples/cookbook/FilterExamplesIT.java
@@ -23,7 +23,6 @@
 import com.google.api.client.util.BackOffUtils;
 import com.google.api.client.util.Sleeper;
 import com.google.api.services.bigquery.model.QueryResponse;
-import org.apache.beam.examples.complete.TrafficRoutes;
 import org.apache.beam.sdk.extensions.gcp.options.GcpOptions;
 import org.apache.beam.sdk.extensions.gcp.util.BackOffAdapter;
 import org.apache.beam.sdk.io.gcp.testing.BigqueryClient;
@@ -54,7 +53,7 @@ public interface FilterExamplesOptions extends TestPipelineOptions, FilterExampl
 
   @Before
   public void setupTestEnvironment() throws Exception {
-    PipelineOptionsFactory.register(TrafficRoutes.TrafficRoutesOptions.class);
+    PipelineOptionsFactory.register(FilterExamplesOptions.class);
     this.options =
         TestPipeline.testingPipelineOptions().as(FilterExamplesIT.FilterExamplesOptions.class);
     this.projectId = TestPipeline.testingPipelineOptions().as(GcpOptions.class).getProject();

diff --git a/examples/java/src/test/java/org/apache/beam/examples/cookbook/MaxPerKeyExamplesIT.java b/examples/java/src/test/java/org/apache/beam/examples/cookbook/MaxPerKeyExamplesIT.java
@@ -23,7 +23,6 @@
 import com.google.api.client.util.BackOffUtils;
 import com.google.api.client.util.Sleeper;
 import com.google.api.services.bigquery.model.QueryResponse;
-import org.apache.beam.examples.complete.TrafficRoutes;
 import org.apache.beam.sdk.extensions.gcp.options.GcpOptions;
 import org.apache.beam.sdk.extensions.gcp.util.BackOffAdapter;
 import org.apache.beam.sdk.io.gcp.testing.BigqueryClient;
@@ -55,7 +54,7 @@ public interface MaxPerKeyExamplesOptions
 
   @Before
   public void setupTestEnvironment() throws Exception {
-    PipelineOptionsFactory.register(TrafficRoutes.TrafficRoutesOptions.class);
+    PipelineOptionsFactory.register(MaxPerKeyExamplesOptions.class);
     this.options =
         TestPipeline.testingPipelineOptions()
             .as(MaxPerKeyExamplesIT.MaxPerKeyExamplesOptions.class);

diff --git a/examples/java/src/test/java/org/apache/beam/examples/cookbook/TriggerExampleIT.java b/examples/java/src/test/java/org/apache/beam/examples/cookbook/TriggerExampleIT.java
@@ -54,7 +54,7 @@ public interface TriggerExamplesOptions
 
   @Before
   public void setupTestEnvironment() throws Exception {
-    PipelineOptionsFactory.register(TriggerExample.TrafficFlowOptions.class);
+    PipelineOptionsFactory.register(TriggerExamplesOptions.class);
     this.options =
         TestPipeline.testingPipelineOptions().as(TriggerExampleIT.TriggerExamplesOptions.class);
     this.projectId = TestPipeline.testingPipelineOptions().as(GcpOptions.class).getProject();

diff --git a/runners/flink/flink_runner.gradle b/runners/flink/flink_runner.gradle
@@ -300,6 +300,8 @@ task examplesIntegrationTest(type: Test) {
   include '**/*IT.class'
   // TODO (BEAM-12572) Fix integration Tests to run with FlinkRunner
   exclude '**/TriggerExampleIT.class' // OOM Exception
+  exclude '**/BigQueryTornadoesIT.class' // Error deleting table
+  exclude '**/WindowedWordCountIT.class' // Assertion error
   maxParallelForks 4
   classpath = configurations.examplesJavaIntegrationTest
   testClassesDirs = files(project(":examples:java").sourceSets.test.output.classesDirs)

diff --git a/runners/spark/spark_runner.gradle b/runners/spark/spark_runner.gradle
@@ -422,6 +422,7 @@ task examplesIntegrationTest(type: Test) {
 
   include '**/*IT.class'
   exclude '**/TriggerExampleIT.class' // OOM Exception
+  exclude '**/WindowedWordCountIT.class' // Failed to read from sharded output
   maxParallelForks 4
   classpath = configurations.validatesRunner
   testClassesDirs = files(project(":examples:java").sourceSets.test.output.classesDirs)