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 2015/05/21 09:53:17 UTC
[18/28] incubator-ignite git commit: # IGNITE-709 Fix
GridDiscoveryEventSelfTest.
# IGNITE-709 Fix GridDiscoveryEventSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c35537de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c35537de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c35537de
Branch: refs/heads/ignite-23
Commit: c35537de58a90d99ae3b90e3b9905bb54e798e66
Parents: ce20aec
Author: sevdokimov <se...@gridgain.com>
Authored: Wed May 20 16:56:33 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed May 20 16:56:33 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/GridDiscoveryEventSelfTest.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c35537de/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
index 59a4f5d..d90bafe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
@@ -33,7 +33,7 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.*;
import static org.apache.ignite.events.EventType.*;
/**
@@ -163,8 +163,6 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
private AtomicInteger cnt = new AtomicInteger();
@Override public boolean apply(Event evt) {
- assert evt.type() == EVT_NODE_LEFT;
-
evts.put(cnt.getAndIncrement(), ((DiscoveryEvent) evt).topologyNodes());
latch.countDown();
@@ -228,7 +226,8 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
private AtomicInteger cnt = new AtomicInteger();
@Override public boolean apply(Event evt) {
- assert evt.type() == EVT_NODE_JOINED || evt.type() == EVT_NODE_LEFT;
+ assert evt.type() == EVT_NODE_JOINED
+ || evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED;
evts.put(cnt.getAndIncrement(), ((DiscoveryEvent) evt).topologyNodes());