Skip to content
This repository was archived by the owner on Nov 11, 2022. It is now read-only.

Run RunnableOnServiceTests with the InProcessPipelineRunner #262

Merged
kennknowles merged 1 commit into from
May 13, 2016
Merged

Run RunnableOnServiceTests with the InProcessPipelineRunner #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,33 @@
<artifactId>maven-compiler-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>InProcessPipelineRunnerTests</id>
<phase>integration-test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<groups>com.google.cloud.dataflow.sdk.testing.RunnableOnService</groups>
<parallel>none</parallel>
<failIfNoTests>true</failIfNoTests>
<systemPropertyVariables>
<runIntegrationTestOnService>false</runIntegrationTestOnService>
<dataflowOptions>
[
"--runner=InProcessPipelineRunner"
]
</dataflowOptions>
</systemPropertyVariables>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down
4 changes: 3 additions & 1 deletion sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/DataflowAssertTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import com.google.cloud.dataflow.sdk.coders.AtomicCoder;
import com.google.cloud.dataflow.sdk.coders.CoderException;
import com.google.cloud.dataflow.sdk.runners.DirectPipelineRunner;
import com.google.cloud.dataflow.sdk.runners.inprocess.InProcessPipelineRunner;
import com.google.cloud.dataflow.sdk.transforms.Create;
import com.google.cloud.dataflow.sdk.transforms.SerializableFunction;
import com.google.cloud.dataflow.sdk.util.common.ElementByteSizeObserver;
Expand Down Expand Up @@ -302,7 +303,8 @@ public void testContainsInAnyOrderFalse() throws Exception {
private static Throwable runExpectingAssertionFailure(Pipeline pipeline) {
// Even though this test will succeed or fail adequately whether local or on the service,
// it results in a different exception depending on the runner.
if (pipeline.getRunner() instanceof DirectPipelineRunner) {
if (pipeline.getRunner() instanceof DirectPipelineRunner
|| pipeline.getRunner() instanceof InProcessPipelineRunner) {
// We cannot use thrown.expect(AssertionError.class) because the AssertionError
// is first caught by JUnit and causes a test failure.
try {
Expand Down