From 755317573eca03da2159bf3c3123b8b5ea8fd716 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 1 Aug 2019 22:27:11 -0500 Subject: [PATCH] Skip large file test if not enough disk space available. (#3928) * Skip large file test if not enough disk space available. Signed-off-by: Joakim Erdfelt * Being consistent with cleanup. Signed-off-by: Joakim Erdfelt * Limping along with known semi-working invoker plugin * back to normal maven-invoker-plugin configuration for local build, on CI use provided settings by Jenkins to keep using mirror Signed-off-by: olivier lamy --- jetty-home/pom.xml | 2 +- .../jetty/webapp/HugeResourceTest.java | 27 ++++++++++++++----- pom.xml | 8 ++++-- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 1e9c227840e..471e67c431b 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -440,7 +440,7 @@ org.eclipse.jetty,org.eclipse.jetty.websocket - infinispan-embedded,infinispan-remote + infinispan-embedded,infinispan-remote,jetty-test-helper,alpn-api,javax.security.auth.message,javax.activation config false META-INF/** diff --git a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/HugeResourceTest.java b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/HugeResourceTest.java index 5c228a59444..361ffffa677 100644 --- a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/HugeResourceTest.java +++ b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/HugeResourceTest.java @@ -25,6 +25,7 @@ import java.io.PrintWriter; import java.net.URI; import java.nio.ByteBuffer; import java.nio.channels.SeekableByteChannel; +import java.nio.file.FileStore; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; @@ -58,6 +59,7 @@ import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.resource.PathResource; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; @@ -86,6 +88,17 @@ public class HugeResourceTest staticBase = MavenTestingUtils.getTargetTestingPath(HugeResourceTest.class.getSimpleName() + "-static-base"); FS.ensureDirExists(staticBase); + FileStore baseFileStore = Files.getFileStore(staticBase); + + // Calculation is (1GB + 4GB + 10GB) == 15GB + // once for static source files + // once again for multipart/form temp files + // for a total of (at least) 30GB needed. + + Assumptions.assumeTrue(baseFileStore.getUnallocatedSpace() > 30 * GB, + String.format("FileStore %s of %s needs at least 30GB of free space for this test (only had %,.2fGB)", + baseFileStore, staticBase, (double)(baseFileStore.getUnallocatedSpace() / GB))); + makeStaticFile(staticBase.resolve("test-1g.dat"), 1 * GB); makeStaticFile(staticBase.resolve("test-4g.dat"), 4 * GB); makeStaticFile(staticBase.resolve("test-10g.dat"), 10 * GB); @@ -109,10 +122,11 @@ public class HugeResourceTest } @AfterAll - public static void cleanupStaticFiles() + public static void cleanupTestFiles() { FS.ensureDeleted(staticBase); FS.ensureDeleted(outputDir); + FS.ensureDeleted(multipartTempDir); } private static void makeStaticFile(Path staticFile, long size) throws IOException @@ -211,19 +225,18 @@ public class HugeResourceTest Response response = responseListener.get(5, TimeUnit.SECONDS); assertThat("HTTP Response Code", response.getStatus(), is(200)); - dumpResponse(response); + // dumpResponse(response); String contentLength = response.getHeaders().get(HttpHeader.CONTENT_LENGTH); long contentLengthLong = Long.parseLong(contentLength); assertThat("Http Response Header: \"Content-Length: " + contentLength + "\"", contentLengthLong, is(expectedSize)); - Path outputFile = outputDir.resolve(filename); - try (OutputStream out = Files.newOutputStream(outputFile); + try (ByteCountingOutputStream out = new ByteCountingOutputStream(); InputStream in = responseListener.getInputStream()) { IO.copy(in, out); + assertThat("Downloaded Files Size: " + filename, out.getCount(), is(expectedSize)); } - assertThat("Downloaded Files Size: " + filename, Files.size(outputFile), is(expectedSize)); } @ParameterizedTest @@ -237,7 +250,7 @@ public class HugeResourceTest Request request = client.newRequest(destUri).method(HttpMethod.POST).content(pathContentProvider); ContentResponse response = request.send(); assertThat("HTTP Response Code", response.getStatus(), is(200)); - dumpResponse(response); + // dumpResponse(response); String responseBody = response.getContentAsString(); assertThat("Response", responseBody, containsString("bytes-received=" + expectedSize)); @@ -256,7 +269,7 @@ public class HugeResourceTest Request request = client.newRequest(destUri).method(HttpMethod.POST).content(multipart); ContentResponse response = request.send(); assertThat("HTTP Response Code", response.getStatus(), is(200)); - dumpResponse(response); + // dumpResponse(response); String responseBody = response.getContentAsString(); String expectedResponse = String.format("part[%s].size=%d", name, expectedSize); diff --git a/pom.xml b/pom.xml index 1e33a8a49cf..6657a93ebc9 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,8 @@ 2.1.1.RELEASE 1.0 1.3 - ${settings.localRepository} + ${project.build.directory}/local-repo + src/it/settings.xml @@ -529,7 +530,7 @@ 300 ${project.build.directory}/it ${localRepoPath} - + ${settingsPath} ${skipTests} */pom.xml @@ -1339,6 +1340,9 @@ ci + + ${env.GLOBAL_MVN_SETTINGS} + aggregates/jetty-all