You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by tu...@apache.org on 2015/11/03 12:26:32 UTC
[70/79] incubator-geode git commit: GEODE-295 - Expecting a suspect
string in BridgeMembershipDUnitTet
GEODE-295 - Expecting a suspect string in BridgeMembershipDUnitTet
testBridgeMembershipEventsInClient already had some code to expect the
suspect string, but it was writing to a weirdly constructed logger, so I
think it was not actually taking effect.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/208e9a1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/208e9a1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/208e9a1d
Branch: refs/heads/feature/GEODE-17
Commit: 208e9a1d1b63c62128b6d0580fccb1bb445311ee
Parents: a49ef25
Author: Dan Smith <up...@apache.org>
Authored: Tue Sep 1 09:07:16 2015 -0700
Committer: tushark <tu...@apache.org>
Committed: Tue Nov 3 16:52:44 2015 +0530
----------------------------------------------------------------------
.../cache30/BridgeMembershipDUnitTest.java | 38 ++++++--------------
1 file changed, 10 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/208e9a1d/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipDUnitTest.java
index 7f6af30..ca7a439 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipDUnitTest.java
@@ -719,6 +719,7 @@ public class BridgeMembershipDUnitTest extends BridgeTestCase {
* crashes or departs gracefully, the client will detect this as a crash.
*/
public void testBridgeMembershipEventsInClient() throws Exception {
+ addExpectedException("IOException");
final boolean[] fired = new boolean[3];
final DistributedMember[] member = new DistributedMember[3];
final String[] memberId = new String[3];
@@ -876,35 +877,16 @@ public class BridgeMembershipDUnitTest extends BridgeTestCase {
assertFalse(isClient[CRASHED]);
resetArraysForTesting(fired, member, memberId, isClient);
-// String expected = "dead server list" +
-// "||live server list" +
-// "||java.io.IOException";
- String expected = "java.io.IOException";
- String addExpected =
- "<ExpectedException action=add>" + expected + "</ExpectedException>";
- String removeExpected =
- "<ExpectedException action=remove>" + expected + "</ExpectedException>";
-
- LogWriter bgexecLogger =
- new LocalLogWriter(InternalLogWriter.ALL_LEVEL, System.out);
- bgexecLogger.info(addExpected);
- getLogWriter().info(addExpected);
- try {
- vm0.invoke(new SerializableRunnable("Stop BridgeServer") {
- public void run() {
- getLogWriter().info("[testBridgeMembershipEventsInClient] Stop BridgeServer");
- stopBridgeServers(getCache());
- }
- });
- synchronized(listener) {
- if (!fired[JOINED] && !fired[CRASHED]) {
- listener.wait(60 * 1000);
- }
+ vm0.invoke(new SerializableRunnable("Stop BridgeServer") {
+ public void run() {
+ getLogWriter().info("[testBridgeMembershipEventsInClient] Stop BridgeServer");
+ stopBridgeServers(getCache());
+ }
+ });
+ synchronized(listener) {
+ if (!fired[JOINED] && !fired[CRASHED]) {
+ listener.wait(60 * 1000);
}
- }
- finally {
- bgexecLogger.info(removeExpected);
- getLogWriter().info(removeExpected);
}
getLogWriter().info("[testBridgeMembershipEventsInClient] assert client detected server departure");