Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8F770200C76 for ; Fri, 7 Apr 2017 21:34:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8E3C0160B97; Fri, 7 Apr 2017 19:34:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C7D5F160BAB for ; Fri, 7 Apr 2017 21:34:03 +0200 (CEST) Received: (qmail 9610 invoked by uid 500); 7 Apr 2017 19:34:02 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 9311 invoked by uid 99); 7 Apr 2017 19:34:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Apr 2017 19:34:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 376A9E152F; Fri, 7 Apr 2017 19:34:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.apache.org Date: Fri, 07 Apr 2017 19:34:11 -0000 Message-Id: In-Reply-To: <7a8bdd103eb04686b0c4e4c2c4879714@git.apache.org> References: <7a8bdd103eb04686b0c4e4c2c4879714@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/19] geode git commit: GEODE-2751 UniversalMembershipListenerAdapterDUnitTest.testSystemClientEventsInServer archived-at: Fri, 07 Apr 2017 19:34:04 -0000 GEODE-2751 UniversalMembershipListenerAdapterDUnitTest.testSystemClientEventsInServer This forces the test to always use numeric host addresses Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/02a31e22 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/02a31e22 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/02a31e22 Branch: refs/heads/feature/GEODE-2632 Commit: 02a31e22ad350a84ea2797562d13c6b16262481b Parents: edd018b Author: Bruce Schuchardt Authored: Wed Apr 5 09:22:19 2017 -0700 Committer: Bruce Schuchardt Committed: Wed Apr 5 09:29:43 2017 -0700 ---------------------------------------------------------------------- ...UniversalMembershipListenerAdapterDUnitTest.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/02a31e22/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java index 66c6f7c..6b952e0 100644 --- a/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java @@ -18,6 +18,8 @@ import static org.apache.geode.distributed.ConfigurationProperties.*; import static org.apache.geode.test.dunit.Assert.*; import static org.apache.geode.test.dunit.LogWriterUtils.*; +import org.apache.geode.internal.net.SocketCreator; +import org.apache.geode.test.dunit.Invoke; import org.awaitility.Awaitility; import java.io.IOException; @@ -29,6 +31,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import org.apache.geode.distributed.internal.ServerLocation; +import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -93,6 +96,16 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes /** Millis to wait for all three event listeners to be notified */ private static final int ASYNC_EVENT_WAIT_MILLIS = 30000; // use Integer.MAX_VALUE for debugging + @Before + public void setTestToUseIpAddresses() { + SocketCreator.resolve_dns = false; + SocketCreator.use_client_host_name = false; + Invoke.invokeInEveryVM(() -> { + SocketCreator.resolve_dns = false; + SocketCreator.use_client_host_name = false; + }); + } + @Override public final void postTearDownCacheTestCase() throws Exception { InternalClientMembership.unregisterAllListeners(); @@ -503,6 +516,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes assertTrue(firedAdapter[JOINED]); assertEquals(clientMember, memberAdapter[JOINED]); + assertFalse(SocketCreator.resolve_dns); assertEquals(clientMemberId, memberIdAdapter[JOINED]); assertTrue(isClientAdapter[JOINED]); assertFalse(firedAdapter[LEFT]); @@ -1852,7 +1866,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes config.put(MCAST_PORT, "0"); config.put(LOCATORS, ""); // config.put(LOG_LEVEL, "fine"); - // config.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "false"); + config.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "false"); getSystem(config); System.out.println("[testServerEventsInLonerClient] create system bridge client");