You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/01/05 15:01:30 UTC
karaf git commit: [KARAF-3414] Remove usage of deprecated ssh methods
in itest
Repository: karaf
Updated Branches:
refs/heads/master 3d386e504 -> ee96f837a
[KARAF-3414] Remove usage of deprecated ssh methods in itest
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ee96f837
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ee96f837
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ee96f837
Branch: refs/heads/master
Commit: ee96f837a57e020b9099fbf907abb12830abeb1a
Parents: 3d386e5
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Jan 5 15:00:58 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Jan 5 15:00:58 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/karaf/itests/SshCommandTestBase.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ee96f837/itests/src/test/java/org/apache/karaf/itests/SshCommandTestBase.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/SshCommandTestBase.java b/itests/src/test/java/org/apache/karaf/itests/SshCommandTestBase.java
index e687f4c..eaf5cda 100644
--- a/itests/src/test/java/org/apache/karaf/itests/SshCommandTestBase.java
+++ b/itests/src/test/java/org/apache/karaf/itests/SshCommandTestBase.java
@@ -21,8 +21,6 @@ import java.io.PipedOutputStream;
import java.util.Arrays;
import java.util.HashSet;
-import org.junit.Assert;
-
import org.apache.karaf.features.Feature;
import org.apache.sshd.ClientChannel;
import org.apache.sshd.ClientSession;
@@ -30,6 +28,7 @@ import org.apache.sshd.SshClient;
import org.apache.sshd.client.future.ConnectFuture;
import org.junit.After;
import org.junit.Before;
+import org.junit.Assert;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
@@ -117,12 +116,13 @@ public class SshCommandTestBase extends KarafTestSupport {
private OutputStream openSshChannel(String username, String password, OutputStream ... outputs) throws Exception {
client = SshClient.setUpDefaultClient();
client.start();
- ConnectFuture future = client.connect("localhost", 8101).await();
+ ConnectFuture future = client.connect(username, "localhost", 8101).await();
session = future.getSession();
int ret = ClientSession.WAIT_AUTH;
while ((ret & ClientSession.WAIT_AUTH) != 0) {
- session.authPassword(username, password);
+ session.addPasswordIdentity(password);
+ session.auth().verify();
ret = session.waitFor(ClientSession.WAIT_AUTH | ClientSession.CLOSED | ClientSession.AUTHED, 0);
}
if ((ret & ClientSession.CLOSED) != 0) {