You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ftpserver-commits@incubator.apache.org by ng...@apache.org on 2007/08/28 13:18:53 UTC

svn commit: r570412 - in /incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests: CustomMaxLoginTest.java DefaultMaxLoginTest.java

Author: ngn
Date: Tue Aug 28 06:18:52 2007
New Revision: 570412

URL: http://svn.apache.org/viewvc?rev=570412&view=rev
Log:
Fixed tests breaking on *nix

Modified:
    incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/CustomMaxLoginTest.java
    incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/DefaultMaxLoginTest.java

Modified: incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/CustomMaxLoginTest.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/CustomMaxLoginTest.java?rev=570412&r1=570411&r2=570412&view=diff
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/CustomMaxLoginTest.java (original)
+++ incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/CustomMaxLoginTest.java Tue Aug 28 06:18:52 2007
@@ -19,6 +19,7 @@
 
 package org.apache.ftpserver.clienttests;
 
+import java.net.SocketException;
 import java.util.Properties;
 
 import org.apache.commons.net.ftp.FTPConnectionClosedException;
@@ -49,6 +50,8 @@
             fail("Must be disconnected");
         } catch(FTPConnectionClosedException e) {
             // OK
+        } catch(SocketException e) {
+        	// OK
         }
     }
 }

Modified: incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/DefaultMaxLoginTest.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/DefaultMaxLoginTest.java?rev=570412&r1=570411&r2=570412&view=diff
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/DefaultMaxLoginTest.java (original)
+++ incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/DefaultMaxLoginTest.java Tue Aug 28 06:18:52 2007
@@ -19,6 +19,8 @@
 
 package org.apache.ftpserver.clienttests;
 
+import java.net.SocketException;
+
 import org.apache.commons.net.ftp.FTPConnectionClosedException;
 
 
@@ -37,6 +39,8 @@
             fail("Must be disconnected");
         } catch(FTPConnectionClosedException e) {
             // OK
+        } catch(SocketException e) {
+        	// OK
         }
     }
 }