Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 B8C66101E0 for ; Fri, 18 Oct 2013 16:02:34 +0000 (UTC) Received: (qmail 16956 invoked by uid 500); 18 Oct 2013 16:02:34 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 16917 invoked by uid 500); 18 Oct 2013 16:02:31 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 16902 invoked by uid 99); 18 Oct 2013 16:02:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Oct 2013 16:02:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C4FE836530; Fri, 18 Oct 2013 16:02:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Fri, 18 Oct 2013 16:02:31 -0000 Message-Id: <479ba3176ec14ba682bd272a063e0436@git.apache.org> In-Reply-To: <8c26e6940386486d9bc7ef4d68952f64@git.apache.org> References: <8c26e6940386486d9bc7ef4d68952f64@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch '1.5.1-SNAPSHOT' Merge branch '1.5.1-SNAPSHOT' Conflicts: server/src/test/java/org/apache/accumulo/server/tabletserver/TabletServerSyncCheckTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4ccf2421 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4ccf2421 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4ccf2421 Branch: refs/heads/master Commit: 4ccf2421b45bc7f10300a9a435c56fda0c977f3f Parents: e498ebb 957676e Author: Josh Elser Authored: Fri Oct 18 12:02:12 2013 -0400 Committer: Josh Elser Committed: Fri Oct 18 12:02:12 2013 -0400 ---------------------------------------------------------------------- .../tabletserver/TabletServerSyncCheckTest.java | 37 -------------------- 1 file changed, 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4ccf2421/server/src/test/java/org/apache/accumulo/server/tabletserver/TabletServerSyncCheckTest.java ---------------------------------------------------------------------- diff --cc server/src/test/java/org/apache/accumulo/server/tabletserver/TabletServerSyncCheckTest.java index 43a3ade,87b4afc..d7cf20e --- a/server/src/test/java/org/apache/accumulo/server/tabletserver/TabletServerSyncCheckTest.java +++ b/server/src/test/java/org/apache/accumulo/server/tabletserver/TabletServerSyncCheckTest.java @@@ -60,53 -45,16 +60,16 @@@ public class TabletServerSyncCheckTest } @Test(expected = RuntimeException.class) - public void testFailureOnExplicitSyncAndAppendFalseConf() { + public void testFailureOnExplicitAppendFalseConf() { Configuration conf = new Configuration(); conf.set(DFS_SUPPORT_APPEND, "false"); - conf.set(DFS_DURABLE_SYNC, "false"); FileSystem fs = new TestFileSystem(conf); + TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.of("foo", fs)); - TabletServer.ensureHdfsSyncIsEnabled(fs); + TabletServer.ensureHdfsSyncIsEnabled(vm); } - @Test(expected = RuntimeException.class) - public void testFailureOnExplicitSyncAndAppendFalseConf() { - Configuration conf = new Configuration(); - conf.set(DFS_SUPPORT_APPEND, "false"); - conf.set(DFS_DURABLE_SYNC, "false"); - - FileSystem fs = new TestFileSystem(conf); - TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.of("foo", fs)); - - TabletServer.ensureHdfsSyncIsEnabled(vm); - } - - @Test - public void testDefaultHadoopAction() { - // We currently depend on Hadoop-2.0.5 in this branch - // so this test should not throw an exception by default - Configuration conf = new Configuration(); - - FileSystem fs = new TestFileSystem(conf); - TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.of("foo", fs)); - - TabletServer.ensureHdfsSyncIsEnabled(vm); - } - - @Test - public void testNecessaryConfiguration() { - // We currently depend on Hadoop-2.0.5 in this branch - // By providing the override, we should not throw an exception - Configuration conf = new Configuration(); - conf.set(DFS_SUPPORT_APPEND, "true"); - - FileSystem fs = new TestFileSystem(conf); - TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.of("foo", fs)); - - TabletServer.ensureHdfsSyncIsEnabled(vm); - } - private class TestFileSystem extends DistributedFileSystem { protected final Configuration conf;