camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmuel...@apache.org
Subject [1/2] git commit: CAMEL-7917: camel-jsch unit tests are failing
Date Wed, 15 Oct 2014 20:43:24 GMT
Repository: camel
Updated Branches:
  refs/heads/master 72c1b81d5 -> 12c31b3ae


CAMEL-7917: camel-jsch unit tests are failing


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/de40138c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/de40138c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/de40138c

Branch: refs/heads/master
Commit: de40138c44b67b8f99a265f0f349a866650a7861
Parents: 72c1b81
Author: Christian Mueller <cmueller@apache.org>
Authored: Wed Oct 15 22:00:54 2014 +0200
Committer: Christian Mueller <cmueller@apache.org>
Committed: Wed Oct 15 22:00:54 2014 +0200

----------------------------------------------------------------------
 .../camel/component/jsch/ScpServerTestSupport.java       | 11 +++--------
 components/camel-jsch/src/test/resources/scp/known_hosts |  0
 parent/pom.xml                                           |  4 ++--
 3 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/de40138c/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
b/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
index 2e93fad..b89c17a 100644
--- a/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
+++ b/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
@@ -47,12 +47,9 @@ import org.junit.BeforeClass;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @version 
- */
 public abstract class ScpServerTestSupport extends CamelTestSupport {
     protected static final Logger LOG = LoggerFactory.getLogger(ScpServerTestSupport.class);
-    protected static final String SCP_ROOT_DIR = "target/scp";
+    protected static final String SCP_ROOT_DIR = "target/test-classes/scp";
     protected static final String KNOWN_HOSTS = "known_hosts";
     protected static int port;
 
@@ -108,7 +105,6 @@ public abstract class ScpServerTestSupport extends CamelTestSupport {
                 // and get errors when the ssh server is stopping.
             }
         }
-        FileUtil.deleteFile(new File(knownHostsFile));
         deleteDirectory(getScpPath());
     }
 
@@ -152,8 +148,7 @@ public abstract class ScpServerTestSupport extends CamelTestSupport {
     }
     
     protected void setupKnownHosts() {
-        knownHostsFile = SCP_ROOT_DIR + "/" + KNOWN_HOSTS + "-" + getPort();
-        FileUtil.deleteFile(new File(knownHostsFile));
+        knownHostsFile = SCP_ROOT_DIR + "/" + KNOWN_HOSTS;
         if (!acceptLocalhostConnections) {
             return;
         }
@@ -162,7 +157,7 @@ public abstract class ScpServerTestSupport extends CamelTestSupport {
         // camel-jsch will only connect to known hosts. For unit testing
         // we use a known key, but since the port it dynamic, the 
         // known_hosts file will be generated by the following code and 
-        // should should contain a line like below (if 
+        // should contain a line like below (if 
         // "HashKnownHosts"=="yes" the hostname:port part will be 
         // hashed and look a bit more complicated).
         //

http://git-wip-us.apache.org/repos/asf/camel/blob/de40138c/components/camel-jsch/src/test/resources/scp/known_hosts
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/test/resources/scp/known_hosts b/components/camel-jsch/src/test/resources/scp/known_hosts
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/camel/blob/de40138c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 94a2c26..17b5bae 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -260,8 +260,8 @@
     <jruby-version>1.7.16</jruby-version>
     <jsendnsca-version>1.3.1</jsendnsca-version>
     <jsmpp-version>2.1.0_4</jsmpp-version>
-    <jsch-version>0.1.50</jsch-version>
-    <jsch-bundle-version>0.1.50_1</jsch-bundle-version>
+    <jsch-version>0.1.51</jsch-version>
+    <jsch-bundle-version>0.1.51_1</jsch-bundle-version>
     <jsendnsca-bundle-version>1.3.1_3</jsendnsca-bundle-version>
     <jsonlib-bundle-version>2.4_1</jsonlib-bundle-version>
     <jsonlib-version>2.4</jsonlib-version>


Mime
View raw message