svn commit: r1475971 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/connector/TestKeepAliveCount.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Apr 25 21:28:31 2013
New Revision: 1475971

URL: http://svn.apache.org/r1475971
Log:
Don't use port 8080 for unit tests

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1475968

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java?rev=1475971&r1=1475970&r2=1475971&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java 
Thu Apr 25 21:28:31 2013
@@ -62,7 +62,6 @@ public class TestKeepAliveCount extends 
             tomcat.getConnector().setProperty("maxKeepAliveRequests", "5");
             tomcat.getConnector().setProperty("soTimeout", "20000");
             tomcat.getConnector().setProperty("keepAliveTimeout", "50000");
-            tomcat.getConnector().setProperty("port", "8080");
             init = true;
         }
 
@@ -70,6 +69,8 @@ public class TestKeepAliveCount extends 
             Tomcat tomcat = getTomcatInstance();
             init();
             tomcat.start();
+            setPort(tomcat.getConnector().getLocalPort());
+
             // Open connection
             connect();
 
@@ -91,6 +92,8 @@ public class TestKeepAliveCount extends 
             Tomcat tomcat = getTomcatInstance();
             init();
             tomcat.start();
+            setPort(tomcat.getConnector().getLocalPort());
+
             // Open connection
             connect();
 

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1475971&r1=1475970&r2=1475971&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Apr 25 21:28:31 2013
@@ -60,12 +60,12 @@
     <changelog>
       <update>
         Update Tomcat's internal copy of Commons FileUpload to FileUpload 1.3.
-        (markt) 
+        (markt)
       </update>
       <fix>
         <bug>54178</bug>: Protect against <code>AsyncListener</code>
         implementations that throw <code>RuntimeException</code>s in response 
to
-        an event. (markt) 
+        an event. (markt)
       </fix>
       <fix>
         <bug>54791</bug>: Restore <code>tools.jar</code> entry in



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org