Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 8f98331c5 -> 34c8b7af8 refs/heads/master fe5fc3056 -> c121ae2d2
ACCUMULO-2484 Allow the invoker of runTest to pass in a unique suffix Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/34c8b7af Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/34c8b7af Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/34c8b7af Branch: refs/heads/1.6.0-SNAPSHOT Commit: 34c8b7af8c0bdb70a99fae3328a9c8a758f9aa3a Parents: 8f98331 Author: Josh Elser <els...@apache.org> Authored: Sat Mar 15 23:16:03 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sat Mar 15 23:23:59 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/test/functional/BulkIT.java | 9 +++++---- .../java/org/apache/accumulo/test/functional/SslIT.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/34c8b7af/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java index 2fc0477..b0fa8e1 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java @@ -39,16 +39,17 @@ public class BulkIT extends SimpleMacIT { @Test(timeout = 4 * 60 * 1000) public void test() throws Exception { - runTest(getConnector(), getTableNames(1)[0], this.getClass().getName()); + runTest(getConnector(), getTableNames(1)[0], this.getClass().getName(), testName.getMethodName()); } - static void runTest(Connector c, String tableName, String filePrefix) throws AccumuloException, AccumuloSecurityException, TableExistsException, IOException, TableNotFoundException, + static void runTest(Connector c, String tableName, String filePrefix, String dirSuffix) throws AccumuloException, AccumuloSecurityException, TableExistsException, IOException, TableNotFoundException, MutationsRejectedException { c.tableOperations().create(tableName); FileSystem fs = FileSystem.get(CachedConfiguration.getInstance()); String base = "target/accumulo-maven-plugin"; + String bulkFailures = base + "/testBulkFail_" + dirSuffix; fs.delete(new Path(base + "/testrf"), true); - fs.mkdirs(new Path(base + "/testBulkFail")); + fs.mkdirs(new Path(bulkFailures)); Opts opts = new Opts(); opts.timestamp = 1; @@ -68,7 +69,7 @@ public class BulkIT extends SimpleMacIT { opts.rows = 1; // create an rfile with one entry, there was a bug with this: TestIngest.ingest(c, opts, BWOPTS); - c.tableOperations().importDirectory(tableName, base + "/testrf", base + "/testBulkFail", false); + c.tableOperations().importDirectory(tableName, base + "/testrf", bulkFailures, false); VerifyIngest.Opts vopts = new VerifyIngest.Opts(); vopts.tableName = tableName; vopts.random = 56; http://git-wip-us.apache.org/repos/asf/accumulo/blob/34c8b7af/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java index 1f0c811..2464546 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java @@ -52,7 +52,7 @@ public class SslIT extends ConfigurableMacIT { @Test(timeout = 5 * 60 * 1000) public void bulk() throws Exception { - BulkIT.runTest(getConnector(), getTableNames(1)[0], this.getClass().getName()); + BulkIT.runTest(getConnector(), getTableNames(1)[0], this.getClass().getName(), testName.getMethodName()); } @Test(timeout = 60 * 1000)
