Repository: incubator-ignite Updated Branches: refs/heads/ignite-471-2 c3b53e250 -> cb3bc8fe8
ignite-471-2: fixing ssl tests Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c493627b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c493627b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c493627b Branch: refs/heads/ignite-471-2 Commit: c493627b87e05a71ce01970179fd4fa4e790633d Parents: c3b53e2 Author: Denis Magda <dma...@gridgain.com> Authored: Wed May 20 15:52:22 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Wed May 20 15:52:22 2015 +0300 ---------------------------------------------------------------------- modules/core/src/test/config/tests.properties | 2 +- .../org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c493627b/modules/core/src/test/config/tests.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/tests.properties b/modules/core/src/test/config/tests.properties index 781b0f1..a9c6b77 100644 --- a/modules/core/src/test/config/tests.properties +++ b/modules/core/src/test/config/tests.properties @@ -129,7 +129,7 @@ ssh.username=uname ssh.password=passwd # SSL tests keystore. -ssl.keystore.path=modules/clients/src/test/keystore/server.jks +ssl.keystore.path=@{IGNITE_HOME}/modules/clients/src/test/keystore/server.jks ssl.keystore.password=123456 # Hadoop home directory. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c493627b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java index ccf01c6..35fe2fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java @@ -35,6 +35,7 @@ public class GridNioSslSelfTest extends GridNioSelfTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { + super.beforeTestsStarted(); sslCtx = GridTestUtils.sslContext(); }
