Return-Path: Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: (qmail 59342 invoked from network); 30 Nov 2010 05:33:08 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 30 Nov 2010 05:33:08 -0000 Received: (qmail 25024 invoked by uid 500); 30 Nov 2010 05:33:08 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 24930 invoked by uid 500); 30 Nov 2010 05:33:06 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 24917 invoked by uid 99); 30 Nov 2010 05:33:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Nov 2010 05:33:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 30 Nov 2010 05:33:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DD67823888CF; Tue, 30 Nov 2010 05:31:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1040411 - in /hadoop/hdfs/trunk: CHANGES.txt src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java Date: Tue, 30 Nov 2010 05:31:30 -0000 To: hdfs-commits@hadoop.apache.org From: cos@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101130053130.DD67823888CF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cos Date: Tue Nov 30 05:31:30 2010 New Revision: 1040411 URL: http://svn.apache.org/viewvc?rev=1040411&view=rev Log: HDFS-1503. TestSaveNamespace fails. Contributed by Todd Lipcon. Modified: hadoop/hdfs/trunk/CHANGES.txt hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java Modified: hadoop/hdfs/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1040411&r1=1040410&r2=1040411&view=diff ============================================================================== --- hadoop/hdfs/trunk/CHANGES.txt (original) +++ hadoop/hdfs/trunk/CHANGES.txt Tue Nov 30 05:31:30 2010 @@ -27,6 +27,8 @@ Trunk (unreleased changes) HDFS-1516. mvn-install is broken after 0.22 branch creation. (cos) + HDFS-1503. TestSaveNamespace fails. (Todd Lipcon via cos) + Release 0.22.0 - Unreleased NEW FEATURES Modified: hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java?rev=1040411&r1=1040410&r2=1040411&view=diff ============================================================================== --- hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java (original) +++ hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java Tue Nov 30 05:31:30 2010 @@ -59,13 +59,8 @@ public class TestSaveNamespace { private static class FaultySaveImage implements Answer { int count = 0; - FSImage origImage; - public FaultySaveImage(FSImage origImage) { - this.origImage = origImage; - } - - public Void answer(InvocationOnMock invocation) throws Exception { + public Void answer(InvocationOnMock invocation) throws Throwable { Object[] args = invocation.getArguments(); File f = (File)args[0]; @@ -74,8 +69,7 @@ public class TestSaveNamespace { throw new RuntimeException("Injected fault: saveFSImage second time"); } LOG.info("Not injecting fault for file: " + f); - origImage.saveFSImage(f); - return null; + return (Void)invocation.callRealMethod(); } } @@ -103,7 +97,7 @@ public class TestSaveNamespace { switch(fault) { case SAVE_FSIMAGE: // The spy throws a RuntimeException when writing to the second directory - doAnswer(new FaultySaveImage(spyImage)). + doAnswer(new FaultySaveImage()). when(spyImage).saveFSImage((File)anyObject()); break; case MOVE_CURRENT: