Repository: ignite Updated Branches: refs/heads/ignite-1758 75c71e4d3 -> 02831be0a
ignite-1758 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/02831be0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/02831be0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/02831be0 Branch: refs/heads/ignite-1758 Commit: 02831be0a98e97c858edaad241984eaf5cd9eff8 Parents: 75c71e4 Author: sboikov <[email protected]> Authored: Fri Oct 30 10:20:33 2015 +0300 Committer: sboikov <[email protected]> Committed: Fri Oct 30 10:20:33 2015 +0300 ---------------------------------------------------------------------- .../cache/portable/CacheObjectPortableProcessorImpl.java | 1 - .../spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java | 10 +++++++--- .../ignite/testsuites/IgniteClientNodesTestSuite.java | 3 --- 3 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/02831be0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java index d3370b5..f0319aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java @@ -40,7 +40,6 @@ import javax.cache.processor.MutableEntry; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.cluster.ClusterTopologyException; -import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; import org.apache.ignite.internal.portable.api.IgnitePortables; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; http://git-wip-us.apache.org/repos/asf/ignite/blob/02831be0/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java index be6da49..09b3ef8 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java @@ -161,6 +161,8 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { * @throws Exception If any error occurs. */ public void testMultiThreadedClientsRestart() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-1123";); + final AtomicBoolean done = new AtomicBoolean(); try { @@ -191,8 +193,8 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { return null; } }, - CLIENT_GRID_CNT - ); + CLIENT_GRID_CNT, + "client-restart"); Thread.sleep(getTestTimeout() - 60 * 1000); @@ -208,7 +210,9 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { /** * @throws Exception If any error occurs. */ - public void _testMultiThreadedClientsServersRestart() throws Throwable { + public void testMultiThreadedClientsServersRestart() throws Throwable { + fail("https://issues.apache.org/jira/browse/IGNITE-1123";); + final AtomicBoolean done = new AtomicBoolean(); try { http://git-wip-us.apache.org/repos/asf/ignite/blob/02831be0/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java index 1558a7c..c9405fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java @@ -18,7 +18,6 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; -import org.apache.ignite.spi.discovery.tcp.IgniteClientReconnectMassiveShutdownTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodeConcurrentStart; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientReconnectTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheManyClientsTest; @@ -40,8 +39,6 @@ public class IgniteClientNodesTestSuite extends TestSuite { suite.addTestSuite(IgniteCacheClientNodeConcurrentStart.class); suite.addTestSuite(IgniteCacheClientReconnectTest.class); - suite.addTestSuite(IgniteClientReconnectMassiveShutdownTest.class); - return suite; } } \ No newline at end of file
