Author: markt
Date: Thu Apr 28 11:12:00 2016
New Revision: 1741410
URL: http://svn.apache.org/viewvc?rev=1741410&view=rev
Log:
Fix another root cause of this test failing (primarily on Gump).
If the server is really slow (and Gump is) the session might not have been
opened by the time the test checked to see if it had been closed. This led to a
failure since the server code was still processing when the test ended.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 28 11:12:00 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java?rev=1741410&r1=1741409&r2=1741410&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
Thu Apr 28 11:12:00 2016
@@ -60,10 +60,20 @@ public class TestCloseBug58624 extends W
URI uri = new URI("ws://localhost:" + getPort() +
Bug58624ServerConfig.PATH);
Session session = wsContainer.connectToServer(client, uri);
+
+ // Wait for session to open on the server
+ int count = 0;
+ while (count < 50 && Bug58624ServerEndpoint.getOpenSessionCount() ==
0) {
+ count++;
+ Thread.sleep(100);
+ }
+ Assert.assertNotEquals(0,
Bug58624ServerEndpoint.getOpenSessionCount());
+
+ // Now close the session
session.close();
// Wait for session to close on the server
- int count = 0;
+ count = 0;
while (count < 50 && Bug58624ServerEndpoint.getOpenSessionCount() > 0)
{
count++;
Thread.sleep(100);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
