Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Jetty 10 - Flag flaky tests to be skipped on CI (#8865) 

* @Tag("flaky") use instead of @Disabled
* Tweaking timeouts on some tests
* Tweaking timeouts on some tests

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Joakim Erdfelt 2022-11-04 14:06:12 -05:00 committed by GitHub
parent bff5b3eb8f
commit 2243ee5f3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -106,7 +106,7 @@ def mavenBuild(jdk, cmdline, mvnName) {
"MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) {
configFileProvider(
[configFile(fileId: 'oss-settings.xml', variable: 'GLOBAL_MVN_SETTINGS')]) {
sh "mvn --no-transfer-progress -s $GLOBAL_MVN_SETTINGS -Dmaven.repo.local=.repository -Pci -DexcludedGroups=\"external, large-disk-resource, stress, slow\" -V -B -e -Djetty.testtracker.log=true $cmdline"
sh "mvn --no-transfer-progress -s $GLOBAL_MVN_SETTINGS -Dmaven.repo.local=.repository -Pci -DexcludedGroups=\"external, large-disk-resource, stress, slow, flaky\" -V -B -e -Djetty.testtracker.log=true $cmdline"
}
}
}

5
jetty-quic/quic-client/src/test/java/org/eclipse/jetty/quic/client/End2EndClientTest.java
View File

@ -40,7 +40,7 @@ import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
@ -102,8 +102,8 @@ public class End2EndClientTest
LifeCycle.stop(server);
}
@Disabled("Flaky test - see Issue #8815")
@Test
@Tag("flaky") // Issue #8815
public void testSimpleHTTP1() throws Exception
{
ContentResponse response = client.newRequest("https://localhost:" + connector.getLocalPort())
@ -141,6 +141,7 @@ public class End2EndClientTest
}
@Test
@Tag("flaky") // Issue #8815
public void testMultiThreadedHTTP1()
{
int count = 1000;

10
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CloseableDoSFilterTest.java
View File

@ -16,6 +16,8 @@ package org.eclipse.jetty.servlets;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(WorkDirExtension.class)
@ -28,4 +30,12 @@ public class CloseableDoSFilterTest extends AbstractDoSFilterTest
{
startServer(workDir, CloseableDoSFilter.class);
}
@Override
@Test
@Tag("flaky")
public void testUnavailableIP() throws Exception
{
super.testUnavailableIP();
}
}

4
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java
View File

@ -251,7 +251,7 @@ public class DemoModulesTests extends AbstractJettyHomeTest
try (JettyHomeTester.Run runConfig = distribution.start(argsConfig))
{
assertTrue(runConfig.awaitFor(5, TimeUnit.SECONDS));
assertTrue(runConfig.awaitFor(20, TimeUnit.SECONDS));
assertEquals(0, runConfig.getExitValue());
int httpPort = distribution.freePort();
@ -264,7 +264,7 @@ public class DemoModulesTests extends AbstractJettyHomeTest
};
try (JettyHomeTester.Run runStart = distribution.start(argsStart))
{
assertTrue(runStart.awaitConsoleLogsFor("Started Server@", 10, TimeUnit.SECONDS));
assertTrue(runStart.awaitConsoleLogsFor("Started Server@", 20, TimeUnit.SECONDS));
startHttpClient();
ContentResponse helloResponse = client.GET("http://localhost:" + httpPort + "/test/hello");

9
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java
View File

@ -43,7 +43,6 @@ import org.eclipse.jetty.http3.client.http.HttpClientTransportOverHTTP3;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.start.FS;
import org.eclipse.jetty.tests.distribution.openid.OpenIdProvider;
import org.eclipse.jetty.toolchain.test.PathAssert;
import org.eclipse.jetty.unixsocket.client.HttpClientTransportOverUnixSockets;
import org.eclipse.jetty.unixsocket.server.UnixSocketConnector;
import org.eclipse.jetty.util.BlockingArrayQueue;
@ -1001,15 +1000,15 @@ public class DistributionTests extends AbstractJettyHomeTest
try (JettyHomeTester.Run run1 = distribution.start("--add-module=https,test-keystore,ssl-ini"))
{
assertTrue(run1.awaitFor(5, TimeUnit.SECONDS));
assertTrue(run1.awaitFor(20, TimeUnit.SECONDS));
assertEquals(0, run1.getExitValue());
// Override the property on the command line with the correct password.
try (JettyHomeTester.Run run2 = distribution.start(pathProperty + "=cmdline"))
{
assertTrue(run2.awaitConsoleLogsFor("Started Server@", 5, TimeUnit.SECONDS));
PathAssert.assertFileExists("${jetty.base}/cmdline", jettyBase.resolve("cmdline"));
PathAssert.assertNotPathExists("${jetty.base}/modbased", jettyBase.resolve("modbased"));
assertTrue(run2.awaitConsoleLogsFor("Started Server@", 20, TimeUnit.SECONDS));
assertTrue(Files.exists(jettyBase.resolve("cmdline")));
assertFalse(Files.exists(jettyBase.resolve("modbased")));
}
}
}