Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 37A4817D19 for ; Wed, 1 Apr 2015 18:21:22 +0000 (UTC) Received: (qmail 63155 invoked by uid 500); 1 Apr 2015 18:20:23 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 63105 invoked by uid 500); 1 Apr 2015 18:20:23 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 63096 invoked by uid 99); 1 Apr 2015 18:20: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; Wed, 01 Apr 2015 18:20:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 42080E0A4E; Wed, 1 Apr 2015 18:20:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tedyu@apache.org To: commits@hbase.apache.org Message-Id: <068a3d34275a4cba8e7f6dfd6175e1b9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-12954 Addendum uses invalid TLD in test Date: Wed, 1 Apr 2015 18:20:23 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1 731464597 -> 39b5ce947 HBASE-12954 Addendum uses invalid TLD in test Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/39b5ce94 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/39b5ce94 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/39b5ce94 Branch: refs/heads/branch-1 Commit: 39b5ce94708d03b9c12ced534b718bdc92479089 Parents: 7314645 Author: tedyu Authored: Wed Apr 1 11:20:16 2015 -0700 Committer: tedyu Committed: Wed Apr 1 11:20:16 2015 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/TestRegionServerHostname.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/39b5ce94/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java index 436bf02..1dbb1ce 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java @@ -47,7 +47,7 @@ public class TestRegionServerHostname { public void testInvalidRegionServerHostnameAbortsServer() throws Exception { final int NUM_MASTERS = 1; final int NUM_RS = 1; - String invalidHostname = "hostAddr"; + String invalidHostname = "hostAddr.invalid"; TEST_UTIL.getConfiguration().set(HRegionServer.HOSTNAME_KEY, invalidHostname); try { TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS); @@ -74,8 +74,7 @@ public class TestRegionServerHostname { // iterate through host addresses and use each as hostname while (addrList.hasMoreElements()) { InetAddress addr = addrList.nextElement(); - if (addr.isLoopbackAddress() || addr.isLinkLocalAddress() || addr.isMulticastAddress() - || !ni.getDisplayName().startsWith("e")) { + if (addr.isLoopbackAddress() || addr.isLinkLocalAddress() || addr.isMulticastAddress()) { continue; } String hostName = addr.getHostName();