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 A7B409DC8 for ; Sat, 2 Jun 2012 05:13:30 +0000 (UTC) Received: (qmail 75459 invoked by uid 500); 2 Jun 2012 05:13:29 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 75207 invoked by uid 500); 2 Jun 2012 05:13:25 -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 75174 invoked by uid 99); 2 Jun 2012 05:13:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Jun 2012 05:13:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Jun 2012 05:13:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7D6F02388847 for ; Sat, 2 Jun 2012 05:13:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1345441 - /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java Date: Sat, 02 Jun 2012 05:13:00 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120602051300.7D6F02388847@eris.apache.org> Author: tedyu Date: Sat Jun 2 05:13:00 2012 New Revision: 1345441 URL: http://svn.apache.org/viewvc?rev=1345441&view=rev Log: HBASE-5936 Addendum adds changes for TestHMasterRPCException that were missed in previous checkin Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java?rev=1345441&r1=1345440&r2=1345441&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java Sat Jun 2 05:13:00 2012 @@ -31,6 +31,7 @@ import org.apache.hadoop.hbase.ipc.HBase import org.apache.hadoop.hbase.ipc.HMasterInterface; import org.apache.hadoop.hbase.protobuf.RequestConverter; import org.apache.hadoop.ipc.RemoteException; +import org.apache.hadoop.hbase.ipc.ServerNotRunningYetException; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -51,9 +52,8 @@ public class TestHMasterRPCException { try { HMasterInterface inf = (HMasterInterface) HBaseRPC.getProxy( HMasterInterface.class, HMasterInterface.VERSION, isa, conf, 100); - inf.isMasterRunning(null,RequestConverter.buildIsMasterRunningRequest()); fail(); - } catch (RemoteException ex) { + } catch (ServerNotRunningYetException ex) { assertTrue(ex.getMessage().startsWith( "org.apache.hadoop.hbase.ipc.ServerNotRunningYetException: Server is not running yet")); } catch (Throwable t) {