You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2014/01/24 09:23:26 UTC
git commit: [SSHD-250] Fix random test failures Refactor tests to
leverage the Utils.getFreePort() method and fix tests that were using a fixed
port number
Updated Branches:
refs/heads/master 28807d49f -> d9ab7f8df
[SSHD-250] Fix random test failures
Refactor tests to leverage the Utils.getFreePort() method and fix tests that were using a fixed port number
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/d9ab7f8d
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/d9ab7f8d
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/d9ab7f8d
Branch: refs/heads/master
Commit: d9ab7f8df2ff27d6a3d36bc1562cecaa8bca7df1
Parents: 28807d4
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Jan 24 09:23:11 2014 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri Jan 24 09:23:11 2014 +0100
----------------------------------------------------------------------
sshd-core/src/test/java/org/apache/sshd/AuthenticationTest.java | 4 +---
sshd-core/src/test/java/org/apache/sshd/CipherTest.java | 5 ++---
sshd-core/src/test/java/org/apache/sshd/ClientTest.java | 4 +---
sshd-core/src/test/java/org/apache/sshd/CompressionTest.java | 4 ++--
sshd-core/src/test/java/org/apache/sshd/KeepAliveTest.java | 4 +---
sshd-core/src/test/java/org/apache/sshd/LoadTest.java | 4 +---
sshd-core/src/test/java/org/apache/sshd/ScpTest.java | 4 +---
sshd-core/src/test/java/org/apache/sshd/ServerTest.java | 4 +---
sshd-core/src/test/java/org/apache/sshd/SftpTest.java | 4 +---
sshd-core/src/test/java/org/apache/sshd/TestSpringConfig.java | 4 +++-
sshd-core/src/test/java/org/apache/sshd/WelcomeBannerTest.java | 4 +---
sshd-core/src/test/resources/spring.xml | 2 +-
sshd-sftp/src/test/java/org/apache/sshd/sftp/SftpTest.java | 4 +---
13 files changed, 17 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d9ab7f8d/sshd-core/src/test/java/org/apache/sshd/AuthenticationTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/AuthenticationTest.java b/sshd-core/src/test/java/org/apache/sshd/AuthenticationTest.java
index 6a1d25a..bbbd863 100644
--- a/sshd-core/src/test/java/org/apache/sshd/AuthenticationTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/AuthenticationTest.java
@@ -48,9 +48,7 @@ public class AuthenticationTest {
@Before
public void setUp() throws Exception {
- ServerSocket s = new ServerSocket(0);
- port = s.getLocalPort();
- s.close();
+ port = Utils.getFreePort();
sshd = SshServer.setUpDefaultServer();
sshd.setPort(port);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d9ab7f8d/sshd-core/src/test/java/org/apache/sshd/CipherTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/CipherTest.java b/sshd-core/src/test/java/org/apache/sshd/CipherTest.java
index d90828f..50e3b63 100644
--- a/sshd-core/src/test/java/org/apache/sshd/CipherTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/CipherTest.java
@@ -39,6 +39,7 @@ import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
import org.apache.sshd.common.random.BouncyCastleRandom;
import org.apache.sshd.util.BogusPasswordAuthenticator;
import org.apache.sshd.util.EchoShellFactory;
+import org.apache.sshd.util.Utils;
import org.junit.After;
import static org.junit.Assert.assertEquals;
import org.junit.Ignore;
@@ -114,9 +115,7 @@ public class CipherTest {
protected void setUp(NamedFactory<org.apache.sshd.common.Cipher> cipher) throws Exception {
- ServerSocket s = new ServerSocket(0);
- port = s.getLocalPort();
- s.close();
+ port = Utils.getFreePort();
sshd = SshServer.setUpDefaultServer();
sshd.setPort(port);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d9ab7f8d/sshd-core/src/test/java/org/apache/sshd/ClientTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/ClientTest.java b/sshd-core/src/test/java/org/apache/sshd/ClientTest.java
index 5ff6126..e747a97 100644
--- a/sshd-core/src/test/java/org/apache/sshd/ClientTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/ClientTest.java
@@ -69,9 +69,7 @@ public class ClientTest {
@Before
public void setUp() throws Exception {
- ServerSocket s = new ServerSocket(0);
- port = s.getLocalPort();
- s.close();
+ port = Utils.getFreePort();
sshd = SshServer.setUpDefaultServer();
sshd.setPort(port);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d9ab7f8d/sshd-core/src/test/java/org/apache/sshd/CompressionTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/CompressionTest.java b/sshd-core/src/test/java/org/apache/sshd/CompressionTest.java
index 9fd407f..f98ed8c 100644
--- a/sshd-core/src/test/java/org/apache/sshd/CompressionTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/CompressionTest.java
@@ -20,6 +20,7 @@ package org.apache.sshd;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.ServerSocket;
import java.util.Arrays;
import com.jcraft.jsch.JSch;
@@ -67,7 +68,6 @@ public class CompressionTest {
protected void setUp(NamedFactory<org.apache.sshd.common.Compression> compression) throws Exception {
sshd = SshServer.setUpDefaultServer();
- sshd.setPort(8000);
sshd.setKeyPairProvider(Utils.createTestHostKeyProvider());
sshd.setCompressionFactories(Arrays.<NamedFactory<org.apache.sshd.common.Compression>>asList(compression));
sshd.setShellFactory(new EchoShellFactory());
@@ -99,7 +99,7 @@ public class CompressionTest {
System.out.println("Log(jsch," + i + "): " + s);
}
});
- com.jcraft.jsch.Session s = sch.getSession("smx", "localhost", 8000);
+ com.jcraft.jsch.Session s = sch.getSession("smx", "localhost", sshd.getPort());
s.setUserInfo(new UserInfo() {
public String getPassphrase() {
return null;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d9ab7f8d/sshd-core/src/test/java/org/apache/sshd/KeepAliveTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/KeepAliveTest.java b/sshd-core/src/test/java/org/apache/sshd/KeepAliveTest.java
index f860256..626d1a9 100644
--- a/sshd-core/src/test/java/org/apache/sshd/KeepAliveTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/KeepAliveTest.java
@@ -46,9 +46,7 @@ public class KeepAliveTest {
@Before
public void setUp() throws Exception {
- ServerSocket s = new ServerSocket(0);
- port = s.getLocalPort();
- s.close();
+ port = Utils.getFreePort();
sshd = SshServer.setUpDefaultServer();
sshd.getProperties().put(ServerFactoryManager.IDLE_TIMEOUT, "1000");
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d9ab7f8d/sshd-core/src/test/java/org/apache/sshd/LoadTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/LoadTest.java b/sshd-core/src/test/java/org/apache/sshd/LoadTest.java
index 4385699..e02b21c 100644
--- a/sshd-core/src/test/java/org/apache/sshd/LoadTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/LoadTest.java
@@ -50,9 +50,7 @@ public class LoadTest {
@Before
public void setUp() throws Exception {
- ServerSocket s = new ServerSocket(0);
- port = s.getLocalPort();
- s.close();
+ port = Utils.getFreePort();
sshd = SshServer.setUpDefaultServer();
sshd.setPort(port);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d9ab7f8d/sshd-core/src/test/java/org/apache/sshd/ScpTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/ScpTest.java b/sshd-core/src/test/java/org/apache/sshd/ScpTest.java
index e23c03d..66da654 100644
--- a/sshd-core/src/test/java/org/apache/sshd/ScpTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/ScpTest.java
@@ -63,9 +63,7 @@ public class ScpTest {
@Before
public void setUp() throws Exception {
- ServerSocket s = new ServerSocket(0);
- port = s.getLocalPort();
- s.close();
+ port = Utils.getFreePort();
// port = 8102;
sshd = SshServer.setUpDefaultServer();
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d9ab7f8d/sshd-core/src/test/java/org/apache/sshd/ServerTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/ServerTest.java b/sshd-core/src/test/java/org/apache/sshd/ServerTest.java
index 1ff0ad5..d7fea87 100644
--- a/sshd-core/src/test/java/org/apache/sshd/ServerTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/ServerTest.java
@@ -62,9 +62,7 @@ public class ServerTest {
@Before
public void setUp() throws Exception {
- ServerSocket s = new ServerSocket(0);
- port = s.getLocalPort();
- s.close();
+ port = Utils.getFreePort();
sshd = SshServer.setUpDefaultServer();
sshd.setPort(port);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d9ab7f8d/sshd-core/src/test/java/org/apache/sshd/SftpTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/SftpTest.java b/sshd-core/src/test/java/org/apache/sshd/SftpTest.java
index eb905e6..c3b03ce 100644
--- a/sshd-core/src/test/java/org/apache/sshd/SftpTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/SftpTest.java
@@ -60,9 +60,7 @@ public class SftpTest {
@Before
public void setUp() throws Exception {
- ServerSocket s = new ServerSocket(0);
- port = s.getLocalPort();
- s.close();
+ port = Utils.getFreePort();
sshd = SshServer.setUpDefaultServer();
sshd.setPort(port);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d9ab7f8d/sshd-core/src/test/java/org/apache/sshd/TestSpringConfig.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/TestSpringConfig.java b/sshd-core/src/test/java/org/apache/sshd/TestSpringConfig.java
index 4833a98..751e689 100644
--- a/sshd-core/src/test/java/org/apache/sshd/TestSpringConfig.java
+++ b/sshd-core/src/test/java/org/apache/sshd/TestSpringConfig.java
@@ -52,6 +52,8 @@ public class TestSpringConfig {
@Test
public void testSpringConfig() throws Exception {
+ int port = ((SshServer) context.getBean("sshServer")).getPort();
+
JSch sch = new JSch();
sch.setLogger(new Logger() {
public boolean isEnabled(int i) {
@@ -62,7 +64,7 @@ public class TestSpringConfig {
System.out.println("Log(jsch," + i + "): " + s);
}
});
- com.jcraft.jsch.Session s = sch.getSession("smx", "localhost", 8000);
+ com.jcraft.jsch.Session s = sch.getSession("smx", "localhost", port);
s.setUserInfo(new UserInfo() {
public String getPassphrase() {
return null; //To change body of implemented methods use File | Settings | File Templates.
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d9ab7f8d/sshd-core/src/test/java/org/apache/sshd/WelcomeBannerTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/WelcomeBannerTest.java b/sshd-core/src/test/java/org/apache/sshd/WelcomeBannerTest.java
index 6a94a48..df57270 100644
--- a/sshd-core/src/test/java/org/apache/sshd/WelcomeBannerTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/WelcomeBannerTest.java
@@ -40,9 +40,7 @@ public class WelcomeBannerTest {
@Before
public void setUp() throws Exception {
- ServerSocket s = new ServerSocket(0);
- port = s.getLocalPort();
- s.close();
+ port = Utils.getFreePort();
sshd = SshServer.setUpDefaultServer();
sshd.setPort(port);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d9ab7f8d/sshd-core/src/test/resources/spring.xml
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/resources/spring.xml b/sshd-core/src/test/resources/spring.xml
index f5f1a06..cd7f86d 100644
--- a/sshd-core/src/test/resources/spring.xml
+++ b/sshd-core/src/test/resources/spring.xml
@@ -23,7 +23,7 @@
http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean name="sshServer" class="org.apache.sshd.SshServer" factory-method="setUpDefaultServer" init-method="start" destroy-method="stop">
- <property name="port" value="8000" />
+ <!--property name="port" value="8000" /-->
<property name="shellFactory">
<bean class="org.apache.sshd.server.shell.ProcessShellFactory">
<property name="command">
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/d9ab7f8d/sshd-sftp/src/test/java/org/apache/sshd/sftp/SftpTest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/test/java/org/apache/sshd/sftp/SftpTest.java b/sshd-sftp/src/test/java/org/apache/sshd/sftp/SftpTest.java
index a1df9e8..5c6debd 100644
--- a/sshd-sftp/src/test/java/org/apache/sshd/sftp/SftpTest.java
+++ b/sshd-sftp/src/test/java/org/apache/sshd/sftp/SftpTest.java
@@ -67,9 +67,7 @@ public class SftpTest {
@Before
public void setUp() throws Exception {
- ServerSocket s = new ServerSocket(0);
- port = s.getLocalPort();
- s.close();
+ port = Utils.getFreePort();
sshd = SshServer.setUpDefaultServer();
sshd.setPort(port);