Exclude ipv6 tests for ci profile (Jenkins) (#3528)

* exclude ipv6 test as currently failing on kubernetes, using junit tag and ci profile activated via Jenkinsfile

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* upgrade surefire to 3.0.0-M3

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
Olivier Lamy 2019-04-06 13:27:42 +10:00 committed by GitHub
parent 6d3ca09281
commit 8829602201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 33 additions and 5 deletions

2
Jenkinsfile vendored
View File

@ -105,7 +105,7 @@ def mavenBuild(jdk, cmdline, mvnName, junitPublishDisabled) {
mavenOpts: mavenOpts,
mavenLocalRepo: localRepo) {
// Some common Maven command line + provided command line
sh "mvn -V -B -T3 -e -Dmaven.test.failure.ignore=true -Djetty.testtracker.log=true $cmdline -Dunix.socket.tmp=" + env.JENKINS_HOME
sh "mvn -Pci -V -B -T3 -e -Dmaven.test.failure.ignore=true -Djetty.testtracker.log=true $cmdline -Dunix.socket.tmp=" + env.JENKINS_HOME
}
}

View File

@ -91,6 +91,8 @@ import org.eclipse.jetty.util.SocketAddressResolver;
import org.eclipse.jetty.util.log.StacklessLogging;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
@ -741,6 +743,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
@ParameterizedTest
@ArgumentsSource(ScenarioProvider.class)
@Tag( "ipv6" )
public void testSendToIPv6Address(Scenario scenario) throws Exception
{
start(scenario, new EmptyServerHandler());
@ -1610,6 +1613,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
@ParameterizedTest
@ArgumentsSource(ScenarioProvider.class)
@Tag( "ipv6" )
public void test_IPv6_Host(Scenario scenario) throws Exception
{
start(scenario, new AbstractHandler()

View File

@ -52,6 +52,7 @@ import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.util.Fields;
import org.eclipse.jetty.util.URIUtil;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
@ -59,6 +60,7 @@ public class HttpClientURITest extends AbstractHttpClientServerTest
{
@ParameterizedTest
@ArgumentsSource(ScenarioProvider.class)
@Tag( "ipv6" )
public void testIPv6Host(Scenario scenario) throws Exception
{
start(scenario, new EmptyServerHandler());

View File

@ -22,6 +22,7 @@ package org.eclipse.jetty.client;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
public class ProxyConfigurationTest
@ -68,6 +69,7 @@ public class ProxyConfigurationTest
}
@Test
@Tag( "ipv6" )
public void testProxyMatchesWithIncludesAndExcludesIPv6() throws Exception
{
HttpProxy proxy = new HttpProxy("host", 0);

View File

@ -60,6 +60,7 @@ import org.eclipse.jetty.toolchain.test.IO;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.log.StacklessLogging;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
@ -505,6 +506,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
}
@Test
@Tag( "ipv6" )
public void testSendToIPv6Address() throws Exception
{
start(new EmptyServerHandler());

View File

@ -40,6 +40,7 @@ import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.log.StacklessLogging;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
public class HttpParserTest
@ -2046,6 +2047,7 @@ public class HttpParserTest
}
@Test
@Tag( "ipv6" )
public void testIPv6Host() throws Exception
{
ByteBuffer buffer = BufferUtil.toBuffer(
@ -2127,6 +2129,7 @@ public class HttpParserTest
}
@Test
@Tag( "ipv6" )
public void testIPv6HostPort() throws Exception
{
ByteBuffer buffer = BufferUtil.toBuffer(

View File

@ -52,6 +52,7 @@ import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.Promise;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
public class ConnectHandlerTest extends AbstractConnectHandlerTest
@ -89,6 +90,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
}
@Test
@Tag( "ipv6" )
public void testCONNECTwithIPv6() throws Exception
{
String hostPort = "[::1]:" + serverConnector.getLocalPort();

View File

@ -27,6 +27,7 @@ import org.hamcrest.Matchers;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
/**
@ -82,6 +83,7 @@ public class ProxyConnectionTest
}
@Test
@Tag( "ipv6" )
public void testIPv6() throws Exception
{
String response=_connector.getResponse("PROXY UNKNOWN eeee:eeee:eeee:eeee:eeee:eeee:eeee:eeee ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 65535 65535\r\n"+

19
pom.xml
View File

@ -46,7 +46,7 @@
<jpms-module-name>${bundle-symbolic-name}</jpms-module-name>
<!-- some maven plugins versions -->
<maven.surefire.version>3.0.0-M2</maven.surefire.version>
<maven.surefire.version>3.0.0-M3</maven.surefire.version>
<maven.compiler.plugin.version>3.8.0</maven.compiler.plugin.version>
<maven.dependency.plugin.version>3.1.1</maven.dependency.plugin.version>
<maven.resources.plugin.version>3.1.0</maven.resources.plugin.version>
@ -1242,9 +1242,20 @@
</profile>
<profile>
<id>ci</id>
<modules>
<module>aggregates/jetty-all</module>
</modules>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.version}</version>
<configuration>
<excludedGroups>ipv6</excludedGroups>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
<profile>
<id>update-version</id>