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/06/12 15:40:22 UTC
[48/50] [abbrv] incubator-ignite git commit: ignite-sprint-6:
fixing/ajusting tests that cooperate with portable marshaller
ignite-sprint-6: fixing/ajusting tests that cooperate with portable marshaller
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c233aa26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c233aa26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c233aa26
Branch: refs/heads/ignite-950
Commit: c233aa260b35766495b23bc57c6ce55f0ddef3b3
Parents: 83a1986
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri Jun 12 15:37:34 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri Jun 12 15:37:34 2015 +0300
----------------------------------------------------------------------
.../processors/datastreamer/DataStreamProcessorSelfTest.java | 3 ++-
.../org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c233aa26/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
index 80bf9e0..8a539d2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
@@ -29,7 +29,6 @@ import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.distributed.near.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -82,6 +81,8 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+ cfg.setPeerClassLoadingEnabled(false);
+
TcpDiscoverySpi spi = new TcpDiscoverySpi();
spi.setForceServerMode(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c233aa26/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
index 978941d..e8c89ec 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
@@ -77,7 +77,7 @@ public class IgniteKernalSelfTestSuite extends TestSuite {
suite.addTestSuite(GridHomePathSelfTest.class);
GridTestUtils.addTestIfNeeded(suite, GridStartupWithSpecifiedWorkDirectorySelfTest.class, ignoredTests);
suite.addTestSuite(GridStartupWithUndefinedIgniteHomeSelfTest.class);
- suite.addTestSuite(GridVersionSelfTest.class);
+ GridTestUtils.addTestIfNeeded(suite, GridVersionSelfTest.class, ignoredTests);
suite.addTestSuite(GridListenActorSelfTest.class);
suite.addTestSuite(GridNodeLocalSelfTest.class);
suite.addTestSuite(GridKernalConcurrentAccessStopSelfTest.class);