Skip to content

Commit

Permalink
Merge pull request #19559 from jaikiran/17093
Browse files Browse the repository at this point in the history
Re-enable remaining excluded Timeout* tests in microprofile-rest-client TCK for Java 16+
  • Loading branch information
gsmet authored Aug 23, 2021
2 parents f7177a9 + 2551282 commit 7fb0070
Showing 1 changed file with 38 additions and 9 deletions.
47 changes: 38 additions & 9 deletions tcks/microprofile-rest-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,15 +185,44 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<!-- the following tests fail for yet unknown reasons (assertion failures) -->
<exclude>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutBuilderIndependentOfMPConfigTest</exclude>
<exclude>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutTest</exclude>
<exclude>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutViaMPConfigTest</exclude>
<exclude>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutViaMPConfigWithConfigKeyTest</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>default-test</id>
<goals>
<goal>test</goal>
</goals>
<configuration>
<excludes>
<!-- the following tests are run in a separate surefire execution
by setting certain JDK system properties during launch -->
<exclude>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutBuilderIndependentOfMPConfigTest</exclude>
<exclude>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutTest</exclude>
<exclude>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutViaMPConfigTest</exclude>
<exclude>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutViaMPConfigWithConfigKeyTest</exclude>
</excludes>
</configuration>
</execution>
<execution>
<id>jdk16-plain-socket-workaround</id>
<goals>
<goal>test</goal>
</goals>
<configuration>
<systemPropertyVariables>
<!-- Temporary workaround to prevent org.eclipse.microprofile.rest.client.tck.timeout.Timeout* tests
from failing because of a different exception type being thrown in Java 13+
during socket connections -->
<jdk.net.usePlainSocketImpl>true</jdk.net.usePlainSocketImpl>
</systemPropertyVariables>
<includes>
<include>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutBuilderIndependentOfMPConfigTest</include>
<include>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutTest</include>
<include>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutViaMPConfigTest</include>
<include>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutViaMPConfigWithConfigKeyTest</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit 7fb0070

Please sign in to comment.