Repository: accumulo Updated Branches: refs/heads/1.6 39aa40d3d -> 230a938a0 refs/heads/master aa35d79a8 -> 56e4483d4
ACCUMULO-3243 Add missing defaultTimeoutSeconds and remove method-level timeout Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/230a938a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/230a938a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/230a938a Branch: refs/heads/1.6 Commit: 230a938a0a91ae640e185406de69b51c92ccb6c1 Parents: 73f3759 Author: Josh Elser <[email protected]> Authored: Tue Nov 4 13:56:34 2014 -0500 Committer: Josh Elser <[email protected]> Committed: Tue Nov 4 14:16:09 2014 -0500 ---------------------------------------------------------------------- .../test/RewriteTabletDirectoriesIT.java | 23 ++++++++++++-------- .../org/apache/accumulo/test/ShellServerIT.java | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/230a938a/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java b/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java index f2efa11..fe233ee 100644 --- a/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java +++ b/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java @@ -16,6 +16,10 @@ */ package org.apache.accumulo.test; +import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; @@ -46,13 +50,14 @@ import org.apache.hadoop.fs.RawLocalFileSystem; import org.apache.hadoop.io.Text; import org.junit.Test; -import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - // ACCUMULO-3263 public class RewriteTabletDirectoriesIT extends ConfigurableMacIT { + @Override + public int defaultTimeoutSeconds() { + return 4 * 60; + } + private Path v1, v2; @Override @@ -72,7 +77,7 @@ public class RewriteTabletDirectoriesIT extends ConfigurableMacIT { super.configure(cfg, hadoopCoreSite); } - @Test(timeout = 4 * 60 * 1000) + @Test public void test() throws Exception { Connector c = getConnector(); c.securityOperations().grantTablePermission(c.whoami(), MetadataTable.NAME, TablePermission.WRITE); @@ -88,7 +93,7 @@ public class RewriteTabletDirectoriesIT extends ConfigurableMacIT { } bw.close(); c.tableOperations().addSplits(tableName, splits); - + BatchScanner scanner = c.createBatchScanner(MetadataTable.NAME, Authorizations.EMPTY, 1); DIRECTORY_COLUMN.fetch(scanner); String tableId = c.tableOperations().tableIdMap().get(tableName); @@ -109,10 +114,10 @@ public class RewriteTabletDirectoriesIT extends ConfigurableMacIT { } bw.close(); assertEquals(splits.size() + 1, count); - + // This should fail: only one volume assertEquals(1, cluster.exec(RandomizeVolumes.class, "-z", cluster.getZooKeepers(), "-i", c.getInstance().getInstanceName(), "-t", tableName).waitFor()); - + cluster.stop(); // add the 2nd volume @@ -122,7 +127,7 @@ public class RewriteTabletDirectoriesIT extends ConfigurableMacIT { BufferedOutputStream fos = new BufferedOutputStream(new FileOutputStream(new File(cluster.getConfig().getConfDir(), "accumulo-site.xml"))); conf.writeXml(fos); fos.close(); - + // initialize volume assertEquals(0, cluster.exec(Initialize.class, "--add-volumes").waitFor()); cluster.start(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/230a938a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java index 50e2d2b..4457e70 100644 --- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java @@ -828,7 +828,7 @@ public class ShellServerIT extends SimpleMacIT { ts.exec("deletetable -f " + table, true); } - @Test(timeout = 45000) + @Test public void help() throws Exception { ts.exec("help -np", true, "Help Commands", true); ts.exec("?", true, "Help Commands", true);
