You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/09/22 14:12:36 UTC
svn commit: r1174085 - in /maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh: AbstractEmbeddedScpWagonTest.java AbstractEmbeddedScpWagonWithKeyTest.java SshServerEmbedded.java

Author: olamy
Date: Thu Sep 22 12:12:35 2011
New Revision: 1174085

URL: http://svn.apache.org/viewvc?rev=1174085&view=rev
Log:
try to prevent sporadic failures on ci server with now closing abruptly sshd

Modified:
    maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java
    maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonWithKeyTest.java
    maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java?rev=1174085&r1=1174084&r2=1174085&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java Thu Sep 22 12:12:35 2011
@@ -20,14 +20,11 @@ package org.apache.maven.wagon.providers
  */
 
 import org.apache.maven.wagon.StreamingWagonTestCase;
-import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.authentication.AuthenticationInfo;
-import org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider;
 import org.apache.maven.wagon.repository.Repository;
 import org.apache.maven.wagon.resource.Resource;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.Arrays;
 
 /**
@@ -64,7 +61,7 @@ public abstract class AbstractEmbeddedSc
             assertEquals( TestData.getUserName(), passwordAuthenticatorRequest.username );
             assertEquals( TestData.getUserPassword(), passwordAuthenticatorRequest.password );
         }
-        sshServerEmbedded.stop( true );
+        sshServerEmbedded.stop();
     }
 
     protected abstract String getProtocol();

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonWithKeyTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonWithKeyTest.java?rev=1174085&r1=1174084&r2=1174085&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonWithKeyTest.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonWithKeyTest.java Thu Sep 22 12:12:35 2011
@@ -60,7 +60,7 @@ public abstract class AbstractEmbeddedSc
         throws Exception
     {
 
-        sshServerEmbedded.stop( true );
+        sshServerEmbedded.stop();
     }
 
     protected abstract String getProtocol();

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java?rev=1174085&r1=1174084&r2=1174085&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java Thu Sep 22 12:12:35 2011
@@ -37,7 +37,6 @@ import org.codehaus.plexus.util.FileUtil
 
 import java.io.File;
 import java.io.IOException;
-import java.security.Security;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -176,10 +175,10 @@ public class SshServerEmbedded
     }
 
 
-    public void stop( boolean immediately )
+    public void stop()
         throws InterruptedException
     {
-        sshd.stop( immediately );
+        sshd.stop( Boolean.getBoolean( "sshd.stopImmediatly" ) );
     }
 
     public int getPort()