This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push: new 2245696 GEODE-5185 and GEODE-5011: Fix test failures introduced by race on committing 2245696 is described below commit 22456961f92b909993fa8f7e68d30e3b9fec9a35 Author: Jens Deppe <jde...@pivotal.io> AuthorDate: Tue May 15 15:45:54 2018 -0700 GEODE-5185 and GEODE-5011: Fix test failures introduced by race on committing --- .../CreateGatewayReceiverCommandDUnitTest.java | 62 +++++++++++----------- .../DestroyGatewayReceiverCommandDUnitTest.java | 28 +++++----- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java index 33847b8..ecf4e25 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java @@ -87,12 +87,13 @@ public class CreateGatewayReceiverCommandDUnitTest { String command = CREATE_GATEWAYRECEIVER; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\""); gfsh.executeAndAssertThat(command).statusIsError() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1) - .tableHasColumnWithValuesContaining("Status", "ERROR: java.lang.IllegalStateException: " - + A_GATEWAY_RECEIVER_ALREADY_EXISTS_ON_THIS_MEMBER); + .tableHasColumnWithValuesContaining("Status", "ERROR") + .tableHasColumnWithValuesContaining("Message", + "java.lang.IllegalStateException: " + A_GATEWAY_RECEIVER_ALREADY_EXISTS_ON_THIS_MEMBER); } @Test @@ -107,13 +108,13 @@ public class CreateGatewayReceiverCommandDUnitTest { String createOnBoth = CREATE_GATEWAYRECEIVER; gfsh.executeAndAssertThat(createOnS1).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\""); gfsh.executeAndAssertThat(createOnBoth).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2) - .tableHasColumnWithValuesContaining("Status", - "ERROR: java.lang.IllegalStateException: " - + A_GATEWAY_RECEIVER_ALREADY_EXISTS_ON_THIS_MEMBER, + .tableHasColumnWithExactValuesInAnyOrder("Status", "ERROR", "OK") + .tableHasColumnWithValuesContaining("Message", + "java.lang.IllegalStateException: " + A_GATEWAY_RECEIVER_ALREADY_EXISTS_ON_THIS_MEMBER, "GatewayReceiver created on member \"" + SERVER_2 + "\""); } @@ -129,11 +130,11 @@ public class CreateGatewayReceiverCommandDUnitTest { String createOnBoth = CREATE_GATEWAYRECEIVER + " --if-not-exists"; gfsh.executeAndAssertThat(createOnS1).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\""); gfsh.executeAndAssertThat(createOnBoth).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "Skipping: " + A_GATEWAY_RECEIVER_ALREADY_EXISTS_ON_THIS_MEMBER, "GatewayReceiver created on member \"" + SERVER_2 + "\""); } @@ -158,7 +159,7 @@ public class CreateGatewayReceiverCommandDUnitTest { + CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000"; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2, SERVER_3) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\"", "GatewayReceiver created on member \"" + SERVER_3 + "\""); @@ -171,12 +172,11 @@ public class CreateGatewayReceiverCommandDUnitTest { // This should fail as there's already a gateway receiver created on the member. gfsh.executeAndAssertThat(command).statusIsError() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2, SERVER_3) - .tableHasColumnWithExactValuesInAnyOrder("Status", - "ERROR: java.lang.IllegalStateException: " - + A_GATEWAY_RECEIVER_ALREADY_EXISTS_ON_THIS_MEMBER, - "ERROR: java.lang.IllegalStateException: " - + A_GATEWAY_RECEIVER_ALREADY_EXISTS_ON_THIS_MEMBER, - "ERROR: java.lang.IllegalStateException: " + .tableHasColumnWithExactValuesInAnyOrder("Status", "ERROR", "ERROR", "ERROR") + .tableHasColumnWithExactValuesInAnyOrder("Message", + " java.lang.IllegalStateException: " + A_GATEWAY_RECEIVER_ALREADY_EXISTS_ON_THIS_MEMBER, + " java.lang.IllegalStateException: " + A_GATEWAY_RECEIVER_ALREADY_EXISTS_ON_THIS_MEMBER, + " java.lang.IllegalStateException: " + A_GATEWAY_RECEIVER_ALREADY_EXISTS_ON_THIS_MEMBER); } @@ -194,7 +194,7 @@ public class CreateGatewayReceiverCommandDUnitTest { String command = CliStrings.CREATE_GATEWAYRECEIVER; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2, SERVER_3) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\"", "GatewayReceiver created on member \"" + SERVER_3 + "\""); @@ -234,7 +234,7 @@ public class CreateGatewayReceiverCommandDUnitTest { + CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000"; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2, SERVER_3) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\"", "GatewayReceiver created on member \"" + SERVER_3 + "\""); @@ -264,7 +264,7 @@ public class CreateGatewayReceiverCommandDUnitTest { + CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000"; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2, SERVER_3) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\"", "GatewayReceiver created on member \"" + SERVER_3 + "\""); @@ -298,7 +298,7 @@ public class CreateGatewayReceiverCommandDUnitTest { String command = CliStrings.CREATE_GATEWAYRECEIVER + " --" + GROUP + "=" + receiverGroup; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2, SERVER_3) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\"", "GatewayReceiver created on member \"" + SERVER_3 + "\""); @@ -335,7 +335,7 @@ public class CreateGatewayReceiverCommandDUnitTest { String command = CliStrings.CREATE_GATEWAYRECEIVER + " --" + GROUP + "=" + receiverGroup; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2, SERVER_3) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\"", "GatewayReceiver created on member \"" + SERVER_3 + "\""); @@ -375,7 +375,7 @@ public class CreateGatewayReceiverCommandDUnitTest { String command = CliStrings.CREATE_GATEWAYRECEIVER + " --" + GROUP + "=" + receiverGroup; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2, SERVER_3) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\"", "GatewayReceiver created on member \"" + SERVER_3 + "\""); @@ -421,7 +421,7 @@ public class CreateGatewayReceiverCommandDUnitTest { + receiverGroup; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2, SERVER_3) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\"", "GatewayReceiver created on member \"" + SERVER_3 + "\""); @@ -464,7 +464,7 @@ public class CreateGatewayReceiverCommandDUnitTest { + receiverGroup; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2, SERVER_3) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\"", "GatewayReceiver created on member \"" + SERVER_3 + "\""); @@ -498,7 +498,7 @@ public class CreateGatewayReceiverCommandDUnitTest { + "=org.apache.geode.cache30.MyGatewayTransportFilter1"; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2, SERVER_3) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\"", "GatewayReceiver created on member \"" + SERVER_3 + "\""); @@ -531,7 +531,7 @@ public class CreateGatewayReceiverCommandDUnitTest { + "=org.apache.geode.cache30.MyGatewayTransportFilter1,org.apache.geode.cache30.MyGatewayTransportFilter2"; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2, SERVER_3) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\"", "GatewayReceiver created on member \"" + SERVER_3 + "\""); @@ -567,7 +567,7 @@ public class CreateGatewayReceiverCommandDUnitTest { + CliStrings.MEMBER + "=" + server1Member.getId(); gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\""); invokeInEveryMember(() -> verifyReceiverCreationWithAttributes(false, 10000, 11000, "localhost", @@ -602,7 +602,7 @@ public class CreateGatewayReceiverCommandDUnitTest { + CliStrings.MEMBER + "=" + server1Member.getId() + "," + server2Member.getId(); gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\""); @@ -636,7 +636,7 @@ public class CreateGatewayReceiverCommandDUnitTest { + "=receiverGroup1"; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2, SERVER_3) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\"", "GatewayReceiver created on member \"" + SERVER_3 + "\""); @@ -669,7 +669,7 @@ public class CreateGatewayReceiverCommandDUnitTest { + "=receiverGroup1"; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\""); @@ -702,7 +702,7 @@ public class CreateGatewayReceiverCommandDUnitTest { + "=receiverGroup1,receiverGroup2"; gfsh.executeAndAssertThat(command).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", SERVER_1, SERVER_2, SERVER_3) - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"" + SERVER_1 + "\"", "GatewayReceiver created on member \"" + SERVER_2 + "\"", "GatewayReceiver created on member \"" + SERVER_3 + "\""); diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewayReceiverCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewayReceiverCommandDUnitTest.java index 83ef572..f824060 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewayReceiverCommandDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewayReceiverCommandDUnitTest.java @@ -124,7 +124,7 @@ public class DestroyGatewayReceiverCommandDUnitTest { gfsh.executeAndAssertThat(createGatewayReceiverCommand("false")).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", "server-3", "server-4", "server-5") - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"server-3\"", "GatewayReceiver created on member \"server-4\"", "GatewayReceiver created on member \"server-5\""); @@ -153,7 +153,7 @@ public class DestroyGatewayReceiverCommandDUnitTest { gfsh.executeAndAssertThat(createGatewayReceiverCommand("false")).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", "server-3", "server-4", "server-5") - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"server-3\"", "GatewayReceiver created on member \"server-4\"", "GatewayReceiver created on member \"server-5\""); @@ -188,7 +188,7 @@ public class DestroyGatewayReceiverCommandDUnitTest { gfsh.executeAndAssertThat(createGatewayReceiverCommand("false")).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", "server-3", "server-4", "server-5") - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"server-3\"", "GatewayReceiver created on member \"server-4\"", "GatewayReceiver created on member \"server-5\""); @@ -224,7 +224,7 @@ public class DestroyGatewayReceiverCommandDUnitTest { gfsh.executeAndAssertThat(createGatewayReceiverCommand("false")).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", "server-3") - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"server-3\""); verifyConfigHasGatewayReceiver("cluster"); @@ -258,7 +258,7 @@ public class DestroyGatewayReceiverCommandDUnitTest { gfsh.executeAndAssertThat(createGatewayReceiverCommand("false")).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", "server-3") - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"server-3\""); verifyConfigHasGatewayReceiver("cluster"); @@ -295,7 +295,7 @@ public class DestroyGatewayReceiverCommandDUnitTest { gfsh.executeAndAssertThat(createGatewayReceiverCommand("true")).statusIsSuccess() .tableHasColumnWithExactValuesInAnyOrder("Member", "server-3", "server-4", "server-5") - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"server-3\"", "GatewayReceiver created on member \"server-4\"", "GatewayReceiver created on member \"server-5\""); @@ -328,7 +328,7 @@ public class DestroyGatewayReceiverCommandDUnitTest { gfsh.executeAndAssertThat( createGatewayReceiverCommand("false", CliStrings.MEMBER + ":server-4,server-5")) .statusIsSuccess().tableHasColumnWithExactValuesInAnyOrder("Member", "server-4", "server-5") - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"server-4\"", "GatewayReceiver created on member \"server-5\""); VMProvider.invokeInEveryMember(WANCommandUtils::verifyReceiverDoesNotExist, server3); @@ -380,7 +380,7 @@ public class DestroyGatewayReceiverCommandDUnitTest { gfsh.executeAndAssertThat(createGatewayReceiverCommand("false", CliStrings.GROUP + ":Grp1")) .statusIsSuccess().tableHasColumnWithExactValuesInAnyOrder("Member", "server-3", "server-4") - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"server-3\"", "GatewayReceiver created on member \"server-4\""); verifyConfigHasGatewayReceiver("Grp1"); @@ -412,11 +412,11 @@ public class DestroyGatewayReceiverCommandDUnitTest { gfsh.executeAndAssertThat(createGatewayReceiverCommand("false", CliStrings.GROUP + ":Grp1")) .statusIsSuccess().tableHasColumnWithExactValuesInAnyOrder("Member", "server-3") - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"server-3\""); gfsh.executeAndAssertThat(createGatewayReceiverCommand("false", CliStrings.GROUP + ":Grp2")) .statusIsSuccess().tableHasColumnWithExactValuesInAnyOrder("Member", "server-4") - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"server-4\""); verifyConfigHasGatewayReceiver("Grp1"); verifyConfigHasGatewayReceiver("Grp2"); @@ -449,11 +449,11 @@ public class DestroyGatewayReceiverCommandDUnitTest { gfsh.executeAndAssertThat(createGatewayReceiverCommand("false", CliStrings.GROUP + ":Grp1")) .statusIsSuccess().tableHasColumnWithExactValuesInAnyOrder("Member", "server-3") - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"server-3\""); gfsh.executeAndAssertThat(createGatewayReceiverCommand("false", CliStrings.GROUP + ":Grp2")) .statusIsSuccess().tableHasColumnWithExactValuesInAnyOrder("Member", "server-4") - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"server-4\""); verifyConfigHasGatewayReceiver("Grp1"); verifyConfigHasGatewayReceiver("Grp2"); @@ -488,7 +488,7 @@ public class DestroyGatewayReceiverCommandDUnitTest { gfsh.executeAndAssertThat(createGatewayReceiverCommand("false", CliStrings.GROUP + ":Grp2")) .statusIsSuccess().tableHasColumnWithExactValuesInAnyOrder("Member", "server-4") - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"server-3\"", "GatewayReceiver created on member \"server-4\""); verifyConfigHasGatewayReceiver("Grp2"); @@ -521,7 +521,7 @@ public class DestroyGatewayReceiverCommandDUnitTest { gfsh.executeAndAssertThat(createGatewayReceiverCommand("false", CliStrings.GROUP + ":Grp2")) .statusIsSuccess().tableHasColumnWithExactValuesInAnyOrder("Member", "server-4") - .tableHasColumnWithValuesContaining("Status", + .tableHasColumnWithValuesContaining("Message", "GatewayReceiver created on member \"server-3\"", "GatewayReceiver created on member \"server-4\""); verifyConfigHasGatewayReceiver("Grp2"); -- To stop receiving notification emails like this one, please contact jensde...@apache.org.