Skip to content

Commit

Permalink
Issue #5880 - Move test-simple-webapp to demos.
Browse files Browse the repository at this point in the history 
Increased waits for CI runs.

Signed-off-by: Simone Bordet <[email protected]>
  • Loading branch information
@sbordet
sbordet committed Jan 19, 2021
1 parent 02d7800 commit 9a49da5
Showing 1 changed file with 28 additions and 28 deletions.
56 changes: 28 additions & 28 deletions ...st-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void testStartStop() throws Exception

try (JettyHomeTester.Run run1 = distribution.start("--add-modules=http"))
{
assertTrue(run1.awaitFor(5, TimeUnit.SECONDS));
assertTrue(run1.awaitFor(10, TimeUnit.SECONDS));
assertEquals(0, run1.getExitValue());

int port = distribution.freePort();
Expand All @@ -87,7 +87,7 @@ public void testStartStop() throws Exception
assertEquals(HttpStatus.NOT_FOUND_404, response.getStatus());

run2.stop();
assertTrue(run2.awaitFor(5, TimeUnit.SECONDS));
assertTrue(run2.awaitFor(10, TimeUnit.SECONDS));
}
}
}
Expand All @@ -108,7 +108,7 @@ public void testQuickStartGenerationAndRun() throws Exception

try (JettyHomeTester.Run run1 = distribution.start(args1))
{
assertTrue(run1.awaitFor(5, TimeUnit.SECONDS));
assertTrue(run1.awaitFor(10, TimeUnit.SECONDS));
assertEquals(0, run1.getExitValue());

File war = distribution.resolveArtifact("org.eclipse.jetty.demos:demo-simple-jsp-webapp:war:" + jettyVersion);
Expand Down Expand Up @@ -159,7 +159,7 @@ public void testSimpleWebAppWithJSP() throws Exception
};
try (JettyHomeTester.Run run1 = distribution.start(args1))
{
assertTrue(run1.awaitFor(5, TimeUnit.SECONDS));
assertTrue(run1.awaitFor(10, TimeUnit.SECONDS));
assertEquals(0, run1.getExitValue());

// Verify that --create-start-ini works
Expand Down Expand Up @@ -198,7 +198,7 @@ public void testSimpleWebAppWithJSPOnModulePath() throws Exception
};
try (JettyHomeTester.Run run1 = distribution.start(args1))
{
assertTrue(run1.awaitFor(5, TimeUnit.SECONDS));
assertTrue(run1.awaitFor(10, TimeUnit.SECONDS));
assertEquals(0, run1.getExitValue());

File war = distribution.resolveArtifact("org.eclipse.jetty.demos:demo-simple-jsp-webapp:war:" + jettyVersion);
Expand Down Expand Up @@ -249,7 +249,7 @@ private void testSimpleWebAppWithJSPOverHTTP2(boolean ssl) throws Exception
};
try (JettyHomeTester.Run run1 = distribution.start(args1))
{
assertTrue(run1.awaitFor(5, TimeUnit.SECONDS));
assertTrue(run1.awaitFor(10, TimeUnit.SECONDS));
assertEquals(0, run1.getExitValue());

File war = distribution.resolveArtifact("org.eclipse.jetty.demos:demo-simple-jsp-webapp:war:" + jettyVersion);
Expand Down Expand Up @@ -345,7 +345,7 @@ public void testLog4j2ModuleWithSimpleWebAppWithJSP() throws Exception
};
try (JettyHomeTester.Run run1 = distribution.start(args1))
{
assertTrue(run1.awaitFor(5, TimeUnit.SECONDS));
assertTrue(run1.awaitFor(10, TimeUnit.SECONDS));
assertEquals(0, run1.getExitValue());
assertTrue(Files.exists(jettyBase.resolve("resources/log4j2.xml")));

Expand Down Expand Up @@ -391,7 +391,7 @@ public void testWebsocketClientInWebappProvidedByServer(String scheme) throws Ex
};
try (JettyHomeTester.Run run1 = distribution.start(args1))
{
assertTrue(run1.awaitFor(5, TimeUnit.SECONDS));
assertTrue(run1.awaitFor(10, TimeUnit.SECONDS));
assertEquals(0, run1.getExitValue());

File webApp = distribution.resolveArtifact("org.eclipse.jetty.tests:test-websocket-client-provided-webapp:war:" + jettyVersion);
Expand Down Expand Up @@ -440,7 +440,7 @@ public void testWebsocketClientInWebapp(String scheme) throws Exception
};
try (JettyHomeTester.Run run1 = distribution.start(args1))
{
assertTrue(run1.awaitFor(5, TimeUnit.SECONDS));
assertTrue(run1.awaitFor(10, TimeUnit.SECONDS));
assertEquals(0, run1.getExitValue());

File webApp = distribution.resolveArtifact("org.eclipse.jetty.tests:test-websocket-client-webapp:war:" + jettyVersion);
Expand Down Expand Up @@ -487,7 +487,7 @@ public void testDownload() throws Exception
};
try (JettyHomeTester.Run run = distribution.start(args1))
{
assertTrue(run.awaitConsoleLogsFor("Base directory was modified", 15, TimeUnit.SECONDS));
assertTrue(run.awaitConsoleLogsFor("Base directory was modified", 110, TimeUnit.SECONDS));
Path target = jettyBase.resolve(outPath);
assertTrue(Files.exists(target), "could not create " + target);
}
Expand All @@ -507,7 +507,7 @@ public void testWebAppWithProxyAndJPMS() throws Exception
};
try (JettyHomeTester.Run run1 = distribution.start(args1))
{
assertTrue(run1.awaitFor(5, TimeUnit.SECONDS));
assertTrue(run1.awaitFor(10, TimeUnit.SECONDS));
assertEquals(0, run1.getExitValue());

Path logFile = distribution.getJettyBase().resolve("resources").resolve("jetty-logging.properties");
Expand All @@ -532,7 +532,7 @@ public void testWebAppWithProxyAndJPMS() throws Exception
}

/**
* This reproduces some classloading issue with MethodHandles in JDK14-15, this has been fixed in JDK16.
* This reproduces some classloading issue with MethodHandles in JDK14-110, This has been fixed in JDK16.
* @throws Exception if there is an error during the test.
* @see <a href="https://bugs.openjdk.java.net/browse/JDK-8244090">JDK-8244090</a>
*/
Expand All @@ -552,7 +552,7 @@ public void testSimpleWebAppWithWebsocket(String arg) throws Exception
};
try (JettyHomeTester.Run run1 = distribution.start(args1))
{
assertTrue(run1.awaitFor(5, TimeUnit.SECONDS));
assertTrue(run1.awaitFor(10, TimeUnit.SECONDS));
assertEquals(0, run1.getExitValue());

File webApp = distribution.resolveArtifact("org.eclipse.jetty.tests:test-websocket-webapp:war:" + jettyVersion);
Expand All @@ -578,20 +578,20 @@ public void testSimpleWebAppWithWebsocket(String arg) throws Exception

// Verify /test1 is able to establish a WebSocket connection.
WsListener webSocketListener = new WsListener();
Session session = wsClient.connect(webSocketListener, serverUri.resolve("/test1")).get(5, TimeUnit.SECONDS);
Session session = wsClient.connect(webSocketListener, serverUri.resolve("/test1")).get(10, TimeUnit.SECONDS);
session.getRemote().sendString("echo message");
assertThat(webSocketListener.textMessages.poll(5, TimeUnit.SECONDS), is("echo message"));
assertThat(webSocketListener.textMessages.poll(10, TimeUnit.SECONDS), is("echo message"));
session.close();
assertTrue(webSocketListener.closeLatch.await(5, TimeUnit.SECONDS));
assertTrue(webSocketListener.closeLatch.await(10, TimeUnit.SECONDS));
assertThat(webSocketListener.closeCode, is(StatusCode.NORMAL));

// Verify /test2 is able to establish a WebSocket connection.
webSocketListener = new WsListener();
session = wsClient.connect(webSocketListener, serverUri.resolve("/test2")).get(5, TimeUnit.SECONDS);
session = wsClient.connect(webSocketListener, serverUri.resolve("/test2")).get(10, TimeUnit.SECONDS);
session.getRemote().sendString("echo message");
assertThat(webSocketListener.textMessages.poll(5, TimeUnit.SECONDS), is("echo message"));
assertThat(webSocketListener.textMessages.poll(10, TimeUnit.SECONDS), is("echo message"));
session.close();
assertTrue(webSocketListener.closeLatch.await(5, TimeUnit.SECONDS));
assertTrue(webSocketListener.closeLatch.await(10, TimeUnit.SECONDS));
assertThat(webSocketListener.closeCode, is(StatusCode.NORMAL));
}
}
Expand Down Expand Up @@ -623,10 +623,10 @@ public void testStartStopLog4j2Modules() throws Exception
Path jettyBase = newTestJettyBaseDirectory();

String jettyVersion = System.getProperty("jettyVersion");
JettyHomeTester distribution = JettyHomeTester.Builder.newInstance() //
.jettyVersion(jettyVersion) //
.jettyBase(jettyBase) //
.mavenLocalRepository(System.getProperty("mavenRepoPath")) //
JettyHomeTester distribution = JettyHomeTester.Builder.newInstance()
.jettyVersion(jettyVersion)
.jettyBase(jettyBase)
.mavenLocalRepository(System.getProperty("mavenRepoPath"))
.build();

String[] args = {
Expand All @@ -636,26 +636,26 @@ public void testStartStopLog4j2Modules() throws Exception

try (JettyHomeTester.Run run1 = distribution.start(args))
{
assertTrue(run1.awaitFor(5, TimeUnit.SECONDS));
assertTrue(run1.awaitFor(10, TimeUnit.SECONDS));
assertEquals(0, run1.getExitValue());

Files.copy(Paths.get("src/test/resources/log4j2.xml"), //
Paths.get(jettyBase.toString(), "resources").resolve("log4j2.xml"), //
Files.copy(Paths.get("src/test/resources/log4j2.xml"),
Paths.get(jettyBase.toString(), "resources").resolve("log4j2.xml"),
StandardCopyOption.REPLACE_EXISTING);

int port = distribution.freePort();
try (JettyHomeTester.Run run2 = distribution.start("jetty.http.port=" + port))
{
assertTrue(run2.awaitLogsFileFor(
jettyBase.resolve("logs").resolve("jetty.log"), //
jettyBase.resolve("logs").resolve("jetty.log"),
"Started Server@", 10, TimeUnit.SECONDS));

startHttpClient();
ContentResponse response = client.GET("http://localhost:" + port);
assertEquals(HttpStatus.NOT_FOUND_404, response.getStatus());

run2.stop();
assertTrue(run2.awaitFor(5, TimeUnit.SECONDS));
assertTrue(run2.awaitFor(10, TimeUnit.SECONDS));
}
}
}
Expand Down

0 comments on commit 9a49da5

Please sign in to comment.