Author: markt
Date: Tue Sep 20 08:37:15 2011
New Revision: 1173022
URL: http://svn.apache.org/viewvc?rev=1173022&view=rev
Log:
Better detection of thread termination at end of test
Better failure messages so it is easier to see the cause of any failure
immediately
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 20 08:37:15 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1173020-1173021
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1173022&r1=1173021&r2=1173022&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Tue Sep 20 08:37:15 2011
@@ -154,14 +154,27 @@ public class TestCometProcessor extends
tomcat.getConnector().stop();
tomcat.getConnector().destroy();
- // Sleep for a couple of seconds to give enough time for the connector
- // stop message to be processed
- Thread.sleep(2000);
+ // Wait for the write thread to stop
+ int count = 0;
+ while (writeThread.isAlive() && count < 100) {
+ Thread.sleep(100);
+ count ++;
+ }
+
+ // Wait for the read thread to stop
+ count = 0;
+ while (readThread.isAlive() && count < 100) {
+ Thread.sleep(100);
+ count ++;
+ }
// Write should trigger an exception once the connector stops since the
// socket should be closed
- assertNotNull(writeThread.getException());
- assertNull(readThread.getException());
+ assertNotNull("No exception in writing thread",
+ writeThread.getException());
+ // Read should terminate gracefully with an EOF
+ assertNull("Read thread terminated with an exception",
+ readThread.getException());
}
private boolean isCometSupported() {
@@ -217,7 +230,7 @@ public class TestCometProcessor extends
private int pingCount;
private OutputStream os;
- private Exception e = null;
+ private volatile Exception e = null;
public PingWriterThread(int pingCount, OutputStream os) {
this.pingCount = pingCount;
@@ -249,7 +262,7 @@ public class TestCometProcessor extends
private InputStream is;
private StringBuilder response = new StringBuilder();
- private Exception e = null;
+ private volatile Exception e = null;
public ResponseReaderThread(InputStream is) {
this.is = is;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
