svn commit: r1174593 - /maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/EmbeddedScpExternalWagonWithKeyTest.java

[olamy]

Author: olamy
Date: Fri Sep 23 08:38:43 2011
New Revision: 1174593

URL: http://svn.apache.org/viewvc?rev=1174593&view=rev
Log:
cleanup fake know host file between tests

Modified:
    
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/EmbeddedScpExternalWagonWithKeyTest.java

Modified: 
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/EmbeddedScpExternalWagonWithKeyTest.java
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/EmbeddedScpExternalWagonWithKeyTest.java?rev=1174593&r1=1174592&r2=1174593&view=diff
==============================================================================
--- 
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/EmbeddedScpExternalWagonWithKeyTest.java
 (original)
+++ 
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/EmbeddedScpExternalWagonWithKeyTest.java
 Fri Sep 23 08:38:43 2011
@@ -24,13 +24,10 @@ import org.apache.maven.wagon.Streams;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.authentication.AuthenticationInfo;
 import 
org.apache.maven.wagon.providers.ssh.AbstractEmbeddedScpWagonWithKeyTest;
-import org.apache.maven.wagon.providers.ssh.TestData;
-import org.apache.maven.wagon.repository.Repository;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 
 import java.io.File;
-import java.util.List;
 
 /**
  * @author <a href="michal.mac...@dimatics.com">Michal Maczka</a>
@@ -47,10 +44,16 @@ public class EmbeddedScpExternalWagonWit
     {
         ScpExternalWagon scpWagon = (ScpExternalWagon) super.getWagon();
         scpWagon.setInteractive( false );
-        scpWagon.setScpArgs( "-o StrictHostKeyChecking=no -o 
UserKnownHostsFile=" + new File(
-            "target/dummy_knowhost" ).getCanonicalPath() );
-        scpWagon.setSshArgs( "-o StrictHostKeyChecking=no -o 
UserKnownHostsFile=" + new File(
-            "target/dummy_knowhost" ).getCanonicalPath() );
+        File dummyKnowHostsFile = new File( "target/dummy_knowhost" );
+        if ( dummyKnowHostsFile.exists() )
+        {
+            dummyKnowHostsFile.delete();
+        }
+        scpWagon.setScpArgs(
+            "-o StrictHostKeyChecking=no -o UserKnownHostsFile=" + 
dummyKnowHostsFile.getCanonicalPath() );
+        scpWagon.setSshArgs(
+            "-o StrictHostKeyChecking=no -o UserKnownHostsFile=" + 
dummyKnowHostsFile.getCanonicalPath() );
+        dummyKnowHostsFile.deleteOnExit();
         return scpWagon;
     }
 
@@ -107,6 +110,4 @@ public class EmbeddedScpExternalWagonWit
     }
 
 
-
-
 }