Author: markt
Date: Tue Feb 2 14:51:33 2016
New Revision: 1728137
URL: http://svn.apache.org/viewvc?rev=1728137&view=rev
Log:
Port fixes from 8.0.x
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java?rev=1728137&r1=1728136&r2=1728137&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestClose.java Tue Feb
2 14:51:33 2016
@@ -79,7 +79,7 @@ public class TestClose extends TomcatBas
private static void awaitLatch(CountDownLatch latch, String failMessage) {
try {
- if (!latch.await(10000, TimeUnit.MILLISECONDS)) {
+ if (!latch.await(5000, TimeUnit.MILLISECONDS)) {
Assert.fail(failMessage);
}
} catch (InterruptedException e) {
@@ -107,7 +107,8 @@ public class TestClose extends TomcatBas
public static void awaitOnError(Class<? extends Throwable> exceptionClazz)
{
awaitLatch(events.onErrorCalled, "onError not called");
- Assert.assertEquals(exceptionClazz,
events.onErrorThrowable.getClass());
+ Assert.assertTrue(exceptionClazz.getName(),
+
events.onErrorThrowable.getClass().isAssignableFrom(exceptionClazz));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
