You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2017/01/29 16:21:56 UTC
[10/50] beam git commit: Add a UsesUnboundedPCollections category and
exclude it from DataflowRunner batch tests
Add a UsesUnboundedPCollections category and exclude it from DataflowRunner batch tests
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/bffe80d5
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/bffe80d5
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/bffe80d5
Branch: refs/heads/python-sdk
Commit: bffe80d55d54592b8146e1b185c72eac38751f33
Parents: f2389ab
Author: Dan Halperin <dh...@google.com>
Authored: Tue Jan 24 13:57:02 2017 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Tue Jan 24 15:51:13 2017 -0800
----------------------------------------------------------------------
runners/google-cloud-dataflow-java/pom.xml | 3 ++-
.../sdk/testing/UsesUnboundedPCollections.java | 23 ++++++++++++++++++++
.../org/apache/beam/sdk/io/PubsubIOTest.java | 4 ++--
3 files changed, 27 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/bffe80d5/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 7bf2089..1d05193 100644
--- a/runners/google-cloud-dataflow-java/pom.xml
+++ b/runners/google-cloud-dataflow-java/pom.xml
@@ -78,9 +78,10 @@
<id>runnable-on-service-tests</id>
<configuration>
<excludedGroups>
+ org.apache.beam.sdk.testing.UsesMetrics,
org.apache.beam.sdk.testing.UsesTimersInParDo,
org.apache.beam.sdk.testing.UsesSplittableParDo,
- org.apache.beam.sdk.testing.UsesMetrics
+ org.apache.beam.sdk.testing.UsesUnboundedPCollections,
</excludedGroups>
<excludes>
<exclude>org.apache.beam.sdk.transforms.FlattenTest</exclude>
http://git-wip-us.apache.org/repos/asf/beam/blob/bffe80d5/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesUnboundedPCollections.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesUnboundedPCollections.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesUnboundedPCollections.java
new file mode 100644
index 0000000..d2caf4a
--- /dev/null
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesUnboundedPCollections.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.beam.sdk.testing;
+
+/**
+ * Category tag for validation tests which utilize at least one unbounded {@code PCollection}.
+ */
+public interface UsesUnboundedPCollections {}
http://git-wip-us.apache.org/repos/asf/beam/blob/bffe80d5/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubIOTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubIOTest.java
index a0d58ea..5ec08b4 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubIOTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubIOTest.java
@@ -25,10 +25,10 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import java.util.Set;
-
import org.apache.beam.sdk.coders.StringUtf8Coder;
import org.apache.beam.sdk.options.ValueProvider.StaticValueProvider;
import org.apache.beam.sdk.testing.RunnableOnService;
+import org.apache.beam.sdk.testing.UsesUnboundedPCollections;
import org.apache.beam.sdk.transforms.display.DisplayData;
import org.apache.beam.sdk.transforms.display.DisplayDataEvaluator;
import org.joda.time.Duration;
@@ -150,7 +150,7 @@ public class PubsubIOTest {
}
@Test
- @Category(RunnableOnService.class)
+ @Category({RunnableOnService.class, UsesUnboundedPCollections.class})
public void testPrimitiveReadDisplayData() {
DisplayDataEvaluator evaluator = DisplayDataEvaluator.create();
Set<DisplayData> displayData;