You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2016/03/25 11:18:35 UTC

[1/2] ignite git commit: Removed isDebug from test.

Repository: ignite
Updated Branches:
  refs/heads/ignite-2801 534892e77 -> 309b41276


Removed isDebug from test.


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

Branch: refs/heads/ignite-2801
Commit: 31ae7ea791e258c49f1b25944cba75fd08d0ca49
Parents: 4cb994a
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Fri Mar 25 12:37:25 2016 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Fri Mar 25 12:37:25 2016 +0300

----------------------------------------------------------------------
 .../CacheContinuousQueryFailoverAbstractSelfTest.java  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/31ae7ea7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
index 263b7f8..32add4f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
@@ -175,7 +175,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC
 
     /** {@inheritDoc} */
     @Override protected long getTestTimeout() {
-        return 5 * 60_000;
+        return 8 * 60_000;
     }
 
     /** {@inheritDoc} */
@@ -244,6 +244,12 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC
             qryClnCache.put(keys.get(0), 100);
         }
 
+        GridTestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override public boolean apply() {
+                return lsnr.evts.size() == 1;
+            }
+        }, 5000);
+
         assertEquals(lsnr.evts.size(), 1);
     }
 
@@ -809,11 +815,6 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC
         checkBackupQueue(3, false);
     }
 
-    /** {@inheritDoc} */
-    @Override public boolean isDebug() {
-        return true;
-    }
-
     /**
      * @param backups Number of backups.
      * @param updateFromClient If {@code true} executes cache update from client node.


[2/2] ignite git commit: Merge remote-tracking branch 'remotes/upstream/gridgain-7.5.10' into ignite-2801

Posted by av...@apache.org.
Merge remote-tracking branch 'remotes/upstream/gridgain-7.5.10' into ignite-2801


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

Branch: refs/heads/ignite-2801
Commit: 309b41276d597d4dc1db92319b63608f04885a25
Parents: 534892e 31ae7ea
Author: Anton Vinogradov <av...@apache.org>
Authored: Fri Mar 25 13:18:04 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Fri Mar 25 13:18:04 2016 +0300

----------------------------------------------------------------------
 .../CacheContinuousQueryFailoverAbstractSelfTest.java  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------