sp-1 fixed test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/daed848b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/daed848b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/daed848b Branch: refs/heads/ignite-9655-merge Commit: daed848b44d6e48025167c44efbd7a3112aff558 Parents: d5af35b Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Feb 13 00:31:33 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Feb 13 00:31:33 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheConcurrentMapSelfTest.java | 4 ++-- .../java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/daed848b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java index a29df74..b889a64 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java @@ -323,7 +323,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { public void testEmptyWeakIterator() throws Exception { final IgniteCache<Integer, String> c = grid().jcache(null); - for (int i = 0; i < 100; i++) { + for (int i = 0; i < 10; i++) { multithreaded(new Callable<Object>() { @SuppressWarnings("UnusedAssignment") @Override public Object call() throws Exception { @@ -343,7 +343,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { return null; } - }, 10); + }, Runtime.getRuntime().availableProcessors()); for (int r = 0; r < 10; r++) { System.gc(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/daed848b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index fc14ac9..da12cdb 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -83,6 +83,7 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(GridCacheSwapReloadSelfTest.class); // Common tests. + suite.addTestSuite(GridCacheConcurrentMapSelfTest.class); suite.addTestSuite(GridCacheAffinityMapperSelfTest.class); suite.addTestSuite(GridCacheAffinityRoutingSelfTest.class); suite.addTestSuite(GridCacheMvccSelfTest.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/daed848b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java index 9762b8e..6b7f956 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java @@ -52,7 +52,6 @@ public class IgniteLangSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCircularBufferSelfTest.class)); suite.addTest(new TestSuite(GridConcurrentLinkedHashMapSelfTest.class)); suite.addTest(new TestSuite(GridConcurrentLinkedHashMapMultiThreadedSelfTest.class)); - suite.addTest(new TestSuite(GridCacheConcurrentMapSelfTest.class)); suite.addTest(new TestSuite(GridStripedLockSelfTest.class)); suite.addTest(new TestSuite(GridFutureAdapterSelfTest.class));
