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

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 <joakim.erdfelt@gmail.com>

* Being consistent with cleanup.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* 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 <oliver.lamy@gmail.com>
This commit is contained in:
Joakim Erdfelt 2019-08-01 22:27:11 -05:00 committed by Olivier Lamy
parent 302341f9c9
commit 755317573e
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-home/pom.xml
View File

@ -440,7 +440,7 @@
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty,org.eclipse.jetty.websocket</includeGroupIds>
<excludeArtifactIds>infinispan-embedded,infinispan-remote</excludeArtifactIds>
<excludeArtifactIds>infinispan-embedded,infinispan-remote,jetty-test-helper,alpn-api,javax.security.auth.message,javax.activation</excludeArtifactIds>
<classifier>config</classifier>
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
<excludes>META-INF/**</excludes>

27
jetty-webapp/src/test/java/org/eclipse/jetty/webapp/HugeResourceTest.java
View File

@ -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);

8
pom.xml
View File

@ -61,7 +61,8 @@
<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
<jsr250-api.version>1.0</jsr250-api.version>
<javax.annotation-api>1.3</javax.annotation-api>
<localRepoPath>${settings.localRepository}</localRepoPath>
<localRepoPath>${project.build.directory}/local-repo</localRepoPath>
<settingsPath>src/it/settings.xml</settingsPath>
</properties>
<licenses>
@ -529,7 +530,7 @@
<timeoutInSeconds>300</timeoutInSeconds>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<localRepositoryPath>${localRepoPath}</localRepositoryPath>
<!--settingsFile>src/it/settings.xml</settingsFile-->
<settingsFile>${settingsPath}</settingsFile>
<skipInvocation>${skipTests}</skipInvocation>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
@ -1339,6 +1340,9 @@
</profile>
<profile>
<id>ci</id>
<properties>
<settingsPath>${env.GLOBAL_MVN_SETTINGS}</settingsPath>
</properties>
<modules>
<module>aggregates/jetty-all</module>
</modules>