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 CD98110497 for ; Thu, 12 Feb 2015 18:14:53 +0000 (UTC) Received: (qmail 54787 invoked by uid 500); 12 Feb 2015 18:14:53 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 54738 invoked by uid 500); 12 Feb 2015 18:14:53 -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 54729 invoked by uid 99); 12 Feb 2015 18:14:53 -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; Thu, 12 Feb 2015 18:14:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8290FE05E2; Thu, 12 Feb 2015 18:14:53 +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: Thu, 12 Feb 2015 18:14:53 -0000 Message-Id: <4cf926df122943208896393cb4413c96@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] accumulo git commit: ACCUMULO-3583 Disable broken tests until fixed. Repository: accumulo Updated Branches: refs/heads/1.5 33890b00e -> 95f17d6bb refs/heads/1.6 fe77101d0 -> 1297dc7bf refs/heads/master 80e334f31 -> 8a34fa875 ACCUMULO-3583 Disable broken tests until fixed. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/95f17d6b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/95f17d6b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/95f17d6b Branch: refs/heads/1.5 Commit: 95f17d6bb4f2701f48198db30971272e2d3efc63 Parents: 33890b0 Author: Josh Elser Authored: Thu Feb 12 12:59:41 2015 -0500 Committer: Josh Elser Committed: Thu Feb 12 13:04:52 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/master/TestMergeState.java | 2 ++ test/src/test/java/org/apache/accumulo/test/ShellServerTest.java | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f17d6b/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java ---------------------------------------------------------------------- diff --git a/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java b/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java index 3c0fae3..1c83f8f 100644 --- a/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java +++ b/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java @@ -48,11 +48,13 @@ import org.apache.accumulo.server.master.state.TabletLocationState; import org.apache.accumulo.server.master.state.TabletState; import org.apache.hadoop.io.Text; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; /** * */ +@Ignore public class TestMergeState { class MockCurrentState implements CurrentState { http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f17d6b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java index 1dfb5ae..a40199a 100644 --- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java @@ -70,6 +70,7 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -629,6 +630,7 @@ public class ShellServerTest { exec("deletetable -f " + table); } + @Ignore @Test(timeout = 45000) public void deleterows() throws Exception { final String table = name.getMethodName();