You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/20 16:07:42 UTC
[1/2] incubator-ignite git commit: ignite-471-2: fixing ssl tests
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 <dm...@gridgain.com>
Authored: Wed May 20 15:52:22 2015 +0300
Committer: Denis Magda <dm...@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();
}
[2/2] incubator-ignite git commit: ignite-471-2: adjusted
P2PTestTaskExternalPath to work with PortableMarshaller
Posted by sb...@apache.org.
ignite-471-2: adjusted P2PTestTaskExternalPath to work with PortableMarshaller
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb3bc8fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb3bc8fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb3bc8fe
Branch: refs/heads/ignite-471-2
Commit: cb3bc8fe88cdbdb81041b5bda76189415f60f81c
Parents: c493627
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed May 20 16:42:10 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed May 20 16:42:10 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java | 10 +++++-----
.../apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb3bc8fe/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java
index c997358..2ae54aa 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java
@@ -64,11 +64,11 @@ public class P2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, Integer
sleep = false;
}
- Map<TestJob, ClusterNode> jobs = U.newHashMap(subgrid.size());
+ Map<TestJob1, ClusterNode> jobs = U.newHashMap(subgrid.size());
for (ClusterNode node : subgrid) {
if (nodeIds.contains(node.id()))
- jobs.put(new TestJob(node.id(), sleep), node);
+ jobs.put(new TestJob1(node.id(), sleep), node);
}
if (!jobs.isEmpty())
@@ -88,7 +88,7 @@ public class P2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, Integer
* Simple job class
*/
@SuppressWarnings({"PublicInnerClass"})
- public static class TestJob extends ComputeJobAdapter {
+ public static class TestJob1 extends ComputeJobAdapter {
/** Task session. */
@TaskSessionResource
private ComputeTaskSession ses;
@@ -107,7 +107,7 @@ public class P2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, Integer
/**
*
*/
- public TestJob() {
+ public TestJob1() {
// No-op.
}
@@ -115,7 +115,7 @@ public class P2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, Integer
* @param nodeId Node ID for node this job is supposed to execute on.
* @param sleep Sleep flag.
*/
- public TestJob(UUID nodeId, boolean sleep) {
+ public TestJob1(UUID nodeId, boolean sleep) {
super(nodeId);
this.sleep = sleep;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb3bc8fe/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java
index 6c7565b..01f3991 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java
@@ -64,11 +64,11 @@ public class P2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, Integer
sleep = false;
}
- Map<TestJob, ClusterNode> jobs = U.newHashMap(subgrid.size());
+ Map<TestJob2, ClusterNode> jobs = U.newHashMap(subgrid.size());
for (ClusterNode node : subgrid) {
if (nodeIds.contains(node.id()))
- jobs.put(new TestJob(node.id(), sleep), node);
+ jobs.put(new TestJob2(node.id(), sleep), node);
}
if (!jobs.isEmpty())
@@ -88,7 +88,7 @@ public class P2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, Integer
* Simple job class
*/
@SuppressWarnings("PublicInnerClass")
- public static class TestJob extends ComputeJobAdapter {
+ public static class TestJob2 extends ComputeJobAdapter {
/** Ignite instance. */
@IgniteInstanceResource
private Ignite ignite;
@@ -108,7 +108,7 @@ public class P2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, Integer
* @param nodeId Node ID for node this job is supposed to execute on.
* @param sleep Sleep flag.
*/
- public TestJob(UUID nodeId, boolean sleep) {
+ public TestJob2(UUID nodeId, boolean sleep) {
super(nodeId);
this.sleep = sleep;