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 2016/08/19 06:01:24 UTC

[4/4] ignite git commit: ignite-3547

ignite-3547


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e97a162b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e97a162b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e97a162b

Branch: refs/heads/ignite-3547-1
Commit: e97a162be440830c844f108741c7d46625331a32
Parents: 09e7fb7
Author: sboikov <sb...@gridgain.com>
Authored: Fri Aug 19 09:01:07 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Aug 19 09:01:07 2016 +0300

----------------------------------------------------------------------
 .../processors/cache/CacheSerializableTransactionsTest.java     | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e97a162b/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 4baef66..3d4f850 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
@@ -3311,6 +3311,8 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void getRemoveTx(boolean nearCache, boolean store) throws Exception {
+        long stopTime = U.currentTimeMillis() + getTestTimeout() - 30_000;
+
         final Ignite ignite0 = ignite(0);
 
         CacheConfiguration<Integer, Integer> ccfg = cacheConfiguration(PARTITIONED, FULL_SYNC, 0, store, false);
@@ -3330,6 +3332,9 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
             }
 
             for (int i = 0; i < 100; i++) {
+                if (U.currentTimeMillis() > stopTime)
+                    break;
+
                 final AtomicInteger cntr = new AtomicInteger();
 
                 final Integer key = i;