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 04257200D0B for ; Tue, 29 Aug 2017 00:06:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 02946165AAC; Mon, 28 Aug 2017 22:06:25 +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 493CB165AA6 for ; Tue, 29 Aug 2017 00:06:24 +0200 (CEST) Received: (qmail 27940 invoked by uid 500); 28 Aug 2017 22:06:23 -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 27931 invoked by uid 99); 28 Aug 2017 22:06:23 -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; Mon, 28 Aug 2017 22:06:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 54823F32AD; Mon, 28 Aug 2017 22:06:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: khowe@apache.org To: commits@geode.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: geode git commit: GEODE-3277: Fix test failure caused by ServerState changes Date: Mon, 28 Aug 2017 22:06:23 +0000 (UTC) archived-at: Mon, 28 Aug 2017 22:06:25 -0000 Repository: geode Updated Branches: refs/heads/develop f41ca9d7d -> 4a5c56eb8 GEODE-3277: Fix test failure caused by ServerState changes Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/4a5c56eb Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/4a5c56eb Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/4a5c56eb Branch: refs/heads/develop Commit: 4a5c56eb8edd277b258e916212d41bec0b0e7b83 Parents: f41ca9d Author: Ken Howe Authored: Mon Aug 28 15:04:52 2017 -0700 Committer: Ken Howe Committed: Mon Aug 28 15:04:52 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/geode/distributed/ServerLauncherTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/4a5c56eb/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java index 2bcd994..696cc9b 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java @@ -18,7 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; @@ -26,6 +25,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import java.net.InetAddress; import java.util.Collections; import org.junit.Before; @@ -271,7 +271,8 @@ public class ServerLauncherTest { launcher.startCacheServer(cache); - verify(cacheServer, times(1)).setBindAddress(isNull()); + // getServerBindAddress() returns the localhost address when set to null in the ServerState + verify(cacheServer, times(1)).setBindAddress(InetAddress.getLocalHost().getCanonicalHostName()); verify(cacheServer, times(1)).setPort(eq(11235)); verify(cacheServer, times(1)).start(); }