You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2014/10/15 19:51:23 UTC
git commit: CAMEL-7917: camel-jsch unit tests are failing
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 498950ede -> 0253b102a
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/0253b102
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0253b102
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0253b102
Branch: refs/heads/camel-2.12.x
Commit: 0253b102a23ed80fb60a504d71cb0f9031cc8bd9
Parents: 498950e
Author: cmueller <cm...@apache.org>
Authored: Wed Oct 15 19:51:11 2014 +0200
Committer: cmueller <cm...@apache.org>
Committed: Wed Oct 15 19:51:11 2014 +0200
----------------------------------------------------------------------
.../camel/component/jsch/ScpServerTestSupport.java | 11 +++--------
parent/pom.xml | 2 +-
2 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0253b102/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 c207742..5c24624 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/0253b102/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4df4c21..cb4b7ec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -237,7 +237,7 @@
<jruby-version>1.7.13</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-version>0.1.51</jsch-version>
<jsch-bundle-version>0.1.50_1</jsch-bundle-version>
<jsendnsca-bundle-version>1.3.1_3</jsendnsca-bundle-version>
<jsonlib-bundle-version>2.4_1</jsonlib-bundle-version>