Repository: ignite Updated Branches: refs/heads/ignite-1.5 a586b49ae -> 85ec80870
ignite-1.5 Fixed test to avoid timeout. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/85ec8087 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/85ec8087 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/85ec8087 Branch: refs/heads/ignite-1.5 Commit: 85ec80870e640725d4e532f9a3c1b3de304fc6de Parents: a586b49 Author: sboikov <sboi...@gridgain.com> Authored: Wed Dec 16 09:49:33 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Dec 16 09:49:33 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheSerializableTransactionsTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/85ec8087/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java index f4533f2..9906ad3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java @@ -2832,6 +2832,8 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { public void testRandomOperations() throws Exception { Ignite ignite0 = ignite(0); + long stopTime = U.currentTimeMillis() + getTestTimeout() - 30_000; + for (CacheConfiguration<Integer, Integer> ccfg : cacheConfigurations()) { logCacheInfo(ccfg); @@ -2869,6 +2871,9 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { tx.commit(); } + + if (i % 100 == 0 && U.currentTimeMillis() > stopTime) + break; } for (int key = 0; key < KEYS; key++) { @@ -2877,6 +2882,9 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { for (int node = 1; node < SRVS + CLIENTS; node++) assertEquals(val, ignite(node).cache(cache.getName()).get(key)); } + + if (U.currentTimeMillis() > stopTime) + break; } } finally {