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

Merge remote-tracking branch 'origin/jetty-9.4.x'

This commit is contained in:
Greg Wilkins 2016-06-08 16:49:21 +10:00
parent 3fafd6ee8f 86e5b1cf9b
commit 5a91c4574a
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jetty-client/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java
View File

@ -105,8 +105,8 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest
}
});
Assert.assertTrue(headersLatch.await(5, TimeUnit.SECONDS));
Assert.assertTrue(successLatch.await(5, TimeUnit.SECONDS));
Assert.assertTrue(headersLatch.await(30, TimeUnit.SECONDS));
Assert.assertTrue(successLatch.await(30, TimeUnit.SECONDS));
Assert.assertEquals(1, idleConnections.size());
Assert.assertEquals(0, activeConnections.size());
@ -156,8 +156,8 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest
}
});
Assert.assertTrue(beginLatch.await(5, TimeUnit.SECONDS));
Assert.assertTrue(failureLatch.await(5, TimeUnit.SECONDS));
Assert.assertTrue(beginLatch.await(30, TimeUnit.SECONDS));
Assert.assertTrue(failureLatch.await(30, TimeUnit.SECONDS));
Assert.assertEquals(0, idleConnections.size());
Assert.assertEquals(0, activeConnections.size());
@ -216,7 +216,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest
}
});
Assert.assertTrue(successLatch.await(5, TimeUnit.SECONDS));
Assert.assertTrue(successLatch.await(30, TimeUnit.SECONDS));
Assert.assertEquals(0, idleConnections.size());
Assert.assertEquals(0, activeConnections.size());
@ -290,7 +290,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest
}
});
Assert.assertTrue(successLatch.await(delay * 5, TimeUnit.MILLISECONDS));
Assert.assertTrue(successLatch.await(delay * 30, TimeUnit.MILLISECONDS));
Assert.assertEquals(0, idleConnections.size());
Assert.assertEquals(0, activeConnections.size());
@ -324,7 +324,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest
failureLatch.countDown();
});
Assert.assertTrue(failureLatch.await(5, TimeUnit.SECONDS));
Assert.assertTrue(failureLatch.await(30, TimeUnit.SECONDS));
Assert.assertEquals(0, idleConnections.size());
Assert.assertEquals(0, activeConnections.size());
@ -369,7 +369,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest
}
});
Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));
Assert.assertTrue(latch.await(30, TimeUnit.SECONDS));
Assert.assertEquals(0, idleConnections.size());
Assert.assertEquals(0, activeConnections.size());
@ -422,7 +422,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest
}
});
Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));
Assert.assertTrue(latch.await(30, TimeUnit.SECONDS));
Assert.assertEquals(0, idleConnections.size());
Assert.assertEquals(0, activeConnections.size());
@ -450,7 +450,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest
ContentResponse response = client.newRequest(host, port)
.scheme(scheme)
.timeout(5, TimeUnit.SECONDS)
.timeout(30, TimeUnit.SECONDS)
.send();
Assert.assertEquals(200, response.getStatus());

2
jetty-monitor/src/test/java/org/eclipse/jetty/monitor/ThreadMonitorTest.java
View File

@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jetty.util.component.Dumpable;
import org.eclipse.jetty.util.log.StacklessLogging;
import org.junit.Ignore;
import org.junit.Test;
@ -36,6 +37,7 @@ public class ThreadMonitorTest
{
public final static int DURATION=4000;
@Ignore
@Test
public void monitorTest() throws Exception
{

2
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
View File

@ -209,8 +209,6 @@ public class HttpChannelState
return Action.DISPATCH;
case COMPLETING:
return Action.COMPLETE;
case COMPLETED:
return Action.TERMINATED;