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

Fix flaky test from #6562 (#6627) 

Fix flaky test from #6562

Signed-off-by: Greg Wilkins <gregw@webtide.com>
This commit is contained in:
Greg Wilkins 2021-08-17 14:05:16 +10:00 committed by GitHub
parent b8370f679c
commit 2f80582615
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-server/src/test/java/org/eclipse/jetty/server/HttpOutputTest.java
View File

@ -23,7 +23,6 @@ import java.nio.channels.ReadableByteChannel;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.AsyncContext; import javax.servlet.AsyncContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
@ -818,7 +817,7 @@ public class HttpOutputTest
@Test @Test
public void testEmptyBuffer() throws Exception public void testEmptyBuffer() throws Exception
{ {
AtomicBoolean committed = new AtomicBoolean(); FuturePromise<Boolean> committed = new FuturePromise<>();
AbstractHandler handler = new AbstractHandler() AbstractHandler handler = new AbstractHandler()
{ {
@Override @Override
@ -827,7 +826,7 @@ public class HttpOutputTest
baseRequest.setHandled(true); baseRequest.setHandled(true);
response.setStatus(200); response.setStatus(200);
((HttpOutput)response.getOutputStream()).write(ByteBuffer.wrap(new byte[0])); ((HttpOutput)response.getOutputStream()).write(ByteBuffer.wrap(new byte[0]));
committed.set(response.isCommitted()); committed.succeeded(response.isCommitted());
} }
}; };
@ -835,13 +834,13 @@ public class HttpOutputTest
handler.start(); handler.start();
String response = _connector.getResponse("GET / HTTP/1.0\nHost: localhost:80\n\n"); String response = _connector.getResponse("GET / HTTP/1.0\nHost: localhost:80\n\n");
assertThat(response, containsString("HTTP/1.1 200 OK")); assertThat(response, containsString("HTTP/1.1 200 OK"));
assertThat(committed.get(), is(false)); assertThat(committed.get(10, TimeUnit.SECONDS), is(false));
} }
@Test @Test
public void testEmptyBufferKnown() throws Exception public void testEmptyBufferKnown() throws Exception
{ {
AtomicBoolean committed = new AtomicBoolean(); FuturePromise<Boolean> committed = new FuturePromise<>();
AbstractHandler handler = new AbstractHandler() AbstractHandler handler = new AbstractHandler()
{ {
@Override @Override
@ -851,7 +850,7 @@ public class HttpOutputTest
response.setStatus(200); response.setStatus(200);
response.setContentLength(0); response.setContentLength(0);
((HttpOutput)response.getOutputStream()).write(ByteBuffer.wrap(new byte[0])); ((HttpOutput)response.getOutputStream()).write(ByteBuffer.wrap(new byte[0]));
committed.set(response.isCommitted()); committed.succeeded(response.isCommitted());
} }
}; };
@ -860,7 +859,7 @@ public class HttpOutputTest
String response = _connector.getResponse("GET / HTTP/1.0\nHost: localhost:80\n\n"); String response = _connector.getResponse("GET / HTTP/1.0\nHost: localhost:80\n\n");
assertThat(response, containsString("HTTP/1.1 200 OK")); assertThat(response, containsString("HTTP/1.1 200 OK"));
assertThat(response, containsString("Content-Length: 0")); assertThat(response, containsString("Content-Length: 0"));
assertThat(committed.get(), is(true)); assertThat(committed.get(10, TimeUnit.SECONDS), is(true));
} }
@Test @Test