|
22 | 22 | import static org.junit.Assert.assertNotNull;
|
23 | 23 | import static org.junit.Assert.assertNull;
|
24 | 24 | import static org.junit.Assert.assertTrue;
|
| 25 | +import static org.junit.Assume.assumeFalse; |
25 | 26 | import static org.junit.Assume.assumeTrue;
|
26 | 27 |
|
27 | 28 | import com.google.api.services.bigquery.model.Table;
|
@@ -372,8 +373,8 @@ private void runStreamingPipelineWithSchemaChange(
|
372 | 373 | // Only run the most relevant test case on Dataflow
|
373 | 374 | if (p.getOptions().getRunner().getName().contains("DataflowRunner")) {
|
374 | 375 | assumeTrue(
|
375 |
| - "Skipping in favor of more relevant test case", |
376 |
| - changeTableSchema && useInputSchema && useAutoSchemaUpdate); |
| 376 | + "Skipping in favor of more relevant test case and to avoid timing issues", |
| 377 | + !changeTableSchema && useInputSchema && useAutoSchemaUpdate); |
377 | 378 | }
|
378 | 379 |
|
379 | 380 | List<String> fieldNamesOrigin = new ArrayList<String>(Arrays.asList(FIELDS));
|
@@ -618,11 +619,11 @@ public void runDynamicDestinationsWithAutoSchemaUpdate(boolean useAtLeastOnce) t
|
618 | 619 | // Need to manually enable streaming engine for legacy dataflow runner
|
619 | 620 | ExperimentalOptions.addExperiment(
|
620 | 621 | p.getOptions().as(ExperimentalOptions.class), GcpOptions.STREAMING_ENGINE_EXPERIMENT);
|
621 |
| - // Only run the most relevant test case on Dataflow |
622 |
| - if (p.getOptions().getRunner().getName().contains("DataflowRunner")) { |
623 |
| - assumeTrue( |
624 |
| - "Skipping in favor of more relevant test case", changeTableSchema && useInputSchema); |
625 |
| - } |
| 622 | + // Skipping dynamic destinations tests on Dataflow because of timing issues |
| 623 | + // These tests are more stable on the DirectRunner, where timing is less variable |
| 624 | + assumeFalse( |
| 625 | + "Skipping dynamic destinations tests on Dataflow because of timing issues", |
| 626 | + p.getOptions().getRunner().getName().contains("DataflowRunner")); |
626 | 627 |
|
627 | 628 | List<String> fieldNamesOrigin = new ArrayList<String>(Arrays.asList(FIELDS));
|
628 | 629 |
|
|
0 commit comments