Author: markt
Date: Mon Mar 6 13:10:52 2017
New Revision: 1785646
URL: http://svn.apache.org/viewvc?rev=1785646&view=rev
Log:
Update unit test to fix failure observed on Gump with NIO2
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java?rev=1785646&r1=1785645&r2=1785646&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
Mon Mar 6 13:10:52 2017
@@ -155,8 +155,11 @@ public class TestClose extends WebSocket
client.httpUpgrade(BaseEndpointConfig.PATH);
client.sendCloseFrame(CloseCodes.GOING_AWAY);
client.closeSocket();
-
- awaitOnClose(CloseCodes.GOING_AWAY);
+ // The close code seen by the server endpoint depends on how quickly
the
+ // server processes the socket close. If it processes it before it
+ // finishes processing the GOING_AWAY (NIO2 can do this) then the
server
+ // endpoint will see CLOSED_ABNORMALLY rather than GOING_AWAY.
+ awaitOnClose(CloseCodes.GOING_AWAY, CloseCodes.CLOSED_ABNORMALLY);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
