Repository: beam Updated Branches: refs/heads/master 16e4c747c -> d32213bfc
Re-enable UsesTimersInParDo tests in Dataflow runner Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/b79c888b Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/b79c888b Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/b79c888b Branch: refs/heads/master Commit: b79c888b01d0c42a35ecf1b98134261237e9c83e Parents: 1a8a217 Author: Kenneth Knowles <[email protected]> Authored: Tue Feb 14 14:54:11 2017 -0800 Committer: Kenneth Knowles <[email protected]> Committed: Wed May 10 14:00:03 2017 -0700 ---------------------------------------------------------------------- runners/google-cloud-dataflow-java/pom.xml | 1 - .../src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/b79c888b/runners/google-cloud-dataflow-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml index fd26ae8..3809335 100644 --- a/runners/google-cloud-dataflow-java/pom.xml +++ b/runners/google-cloud-dataflow-java/pom.xml @@ -164,7 +164,6 @@ org.apache.beam.sdk.testing.UsesGaugeMetrics, org.apache.beam.sdk.testing.UsesSetState, org.apache.beam.sdk.testing.UsesMapState, - org.apache.beam.sdk.testing.UsesTimersInParDo, org.apache.beam.sdk.testing.UsesSplittableParDo, org.apache.beam.sdk.testing.UsesUnboundedPCollections, org.apache.beam.sdk.testing.UsesTestStream, http://git-wip-us.apache.org/repos/asf/beam/blob/b79c888b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java index ef27f4c..35c02ba 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java @@ -54,7 +54,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.beam.sdk.Pipeline.PipelineExecutionException; import org.apache.beam.sdk.coders.AtomicCoder; import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.coders.CoderException; @@ -2745,7 +2744,7 @@ public class ParDoTest implements Serializable { }; PCollection<Integer> output = pipeline.apply(Create.of(KV.of("hello", 37))).apply(ParDo.of(fn)); - thrown.expect(PipelineExecutionException.class); + thrown.expect(RuntimeException.class); // Note that runners can reasonably vary their message - this matcher should be flexible // and can be evolved. thrown.expectMessage("relative timers"); @@ -2775,7 +2774,7 @@ public class ParDoTest implements Serializable { }; PCollection<Integer> output = pipeline.apply(Create.of(KV.of("hello", 37))).apply(ParDo.of(fn)); - thrown.expect(PipelineExecutionException.class); + thrown.expect(RuntimeException.class); // Note that runners can reasonably vary their message - this matcher should be flexible // and can be evolved. thrown.expectMessage("event time timer");
