accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [1/2] git commit: ACCUMULO-2392 Log the MAC directory used by a test
Date Mon, 31 Mar 2014 18:48:36 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT f4a9626a5 -> fff852fce


ACCUMULO-2392 Log the MAC directory used by a test

Add a log message to SimpleMacIT to inform which MiniAccumuloCluster instance is
in use for each SimpleMacIT test, to make it easier to debug a failed test.

Additionally, renamed a trivial helper method to more accurately reflect its
purpose.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dda2fb06
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dda2fb06
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dda2fb06

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: dda2fb06ba6452d5af6bda3809684ec2f3413022
Parents: f4a9626
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Mon Mar 31 14:11:36 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Mon Mar 31 14:11:36 2014 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/test/BatchWriterIT.java |  2 +-
 .../accumulo/test/BulkImportVolumeIT.java       |  2 +-
 .../org/apache/accumulo/test/CleanWalIT.java    |  2 +-
 .../accumulo/test/ConditionalWriterIT.java      | 32 ++++++++++----------
 .../org/apache/accumulo/test/DeleteRowsIT.java  |  2 +-
 .../test/MasterRepairsDualAssignmentIT.java     |  2 +-
 .../org/apache/accumulo/test/NamespacesIT.java  |  2 +-
 .../apache/accumulo/test/SplitRecoveryIT.java   |  2 +-
 .../java/org/apache/accumulo/test/VolumeIT.java | 12 ++++----
 .../accumulo/test/functional/AbstractMacIT.java |  2 +-
 .../test/functional/AccumuloInputFormatIT.java  |  2 +-
 .../accumulo/test/functional/AddSplitIT.java    |  2 +-
 .../test/functional/BackupMasterIT.java         |  2 +-
 .../test/functional/BadIteratorMincIT.java      |  2 +-
 .../test/functional/BatchScanSplitIT.java       |  2 +-
 .../test/functional/BatchWriterFlushIT.java     |  2 +-
 .../accumulo/test/functional/BulkFileIT.java    |  4 +--
 .../apache/accumulo/test/functional/BulkIT.java |  2 +-
 .../accumulo/test/functional/ClassLoaderIT.java |  2 +-
 .../accumulo/test/functional/CleanTmpIT.java    |  2 +-
 .../accumulo/test/functional/CleanUpIT.java     |  2 +-
 .../accumulo/test/functional/CloneTestIT.java   |  4 +--
 .../accumulo/test/functional/CombinerIT.java    |  2 +-
 .../functional/ConfigurableCompactionIT.java    |  2 +-
 .../accumulo/test/functional/ConstraintIT.java  |  2 +-
 .../test/functional/CreateAndUseIT.java         |  2 +-
 .../test/functional/CreateManyScannersIT.java   |  2 +-
 .../accumulo/test/functional/DeleteRowsIT.java  |  2 +-
 .../test/functional/DeleteRowsSplitIT.java      |  2 +-
 .../functional/DeleteTableDuringSplitIT.java    |  2 +-
 .../test/functional/FateStarvationIT.java       |  2 +-
 .../test/functional/GarbageCollectorIT.java     |  4 +--
 .../test/functional/MasterAssignmentIT.java     |  2 +-
 .../accumulo/test/functional/MergeIT.java       |  6 ++--
 .../accumulo/test/functional/MetadataIT.java    |  4 +--
 .../accumulo/test/functional/PermissionsIT.java |  4 +--
 .../accumulo/test/functional/RenameIT.java      |  2 +-
 .../test/functional/ScanIteratorIT.java         |  2 +-
 .../accumulo/test/functional/ScanRangeIT.java   |  2 +-
 .../test/functional/ServerSideErrorIT.java      |  2 +-
 .../accumulo/test/functional/SimpleMacIT.java   |  7 +++++
 .../test/functional/SparseColumnFamilyIT.java   |  2 +-
 .../apache/accumulo/test/functional/SslIT.java  |  2 +-
 .../accumulo/test/functional/TableIT.java       |  2 +-
 .../accumulo/test/functional/TabletIT.java      |  2 +-
 .../accumulo/test/functional/TimeoutIT.java     |  2 +-
 .../accumulo/test/functional/VisibilityIT.java  |  2 +-
 .../accumulo/test/functional/WriteLotsIT.java   |  2 +-
 48 files changed, 81 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/BatchWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/BatchWriterIT.java b/test/src/test/java/org/apache/accumulo/test/BatchWriterIT.java
index e467f36..ff45f47 100644
--- a/test/src/test/java/org/apache/accumulo/test/BatchWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/BatchWriterIT.java
@@ -29,7 +29,7 @@ public class BatchWriterIT extends SimpleMacIT {
   @Test(timeout = 30 * 1000)
   public void test() throws Exception {
     // call the batchwriter with buffer of size zero
-    String table = getTableNames(1)[0];
+    String table = getUniqueNames(1)[0];
     Connector c = getConnector();
     c.tableOperations().create(table);
     BatchWriterConfig config = new BatchWriterConfig();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/BulkImportVolumeIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/BulkImportVolumeIT.java b/test/src/test/java/org/apache/accumulo/test/BulkImportVolumeIT.java
index 25d5784..37ba5c7 100644
--- a/test/src/test/java/org/apache/accumulo/test/BulkImportVolumeIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/BulkImportVolumeIT.java
@@ -56,7 +56,7 @@ public class BulkImportVolumeIT extends ConfigurableMacIT {
 
   @Test(timeout= 60 * 1000) 
   public void testBulkImportFailure() throws Exception {
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     TableOperations to = getConnector().tableOperations();
     to.create(tableName);
     File bulk = new File(rootPath() + "/bulk");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java b/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
index 7fd60d4..a6f836c 100644
--- a/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
@@ -51,7 +51,7 @@ public class CleanWalIT extends ConfigurableMacIT {
   @Test(timeout= 4 * 60 * 1000)
   public void test() throws Exception {
     Connector conn = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     conn.tableOperations().create(tableName);
     BatchWriter bw = conn.createBatchWriter(tableName, new BatchWriterConfig());
     Mutation m = new Mutation("row");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index 3f98c12..15c1fd3 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -101,7 +101,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
   public void testBasic() throws Exception {
 
     Connector conn = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
 
     conn.tableOperations().create(tableName);
 
@@ -179,7 +179,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
   public void testFields() throws Exception {
 
     Connector conn = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
 
     conn.tableOperations().create(tableName);
 
@@ -262,7 +262,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
     // test when a user sets a col vis in a condition that can never be seen
 
     Connector conn = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
 
     conn.tableOperations().create(tableName);
 
@@ -359,7 +359,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
     // ensure constraint violations are properly reported
 
     Connector conn = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
 
     conn.tableOperations().create(tableName);
     conn.tableOperations().addConstraint(tableName, AlphaNumKeyConstraint.class.getName());
@@ -388,7 +388,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
   public void testIterators() throws Exception {
 
     Connector conn = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
 
     conn.tableOperations().create(tableName, false);
 
@@ -484,7 +484,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
   public void testBatch() throws Exception {
 
     Connector conn = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
 
     conn.tableOperations().create(tableName);
 
@@ -589,7 +589,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
   public void testBigBatch() throws Exception {
 
     Connector conn = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
 
     conn.tableOperations().create(tableName);
     conn.tableOperations().addSplits(tableName, nss("2", "4", "6"));
@@ -662,7 +662,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
   public void testBatchErrors() throws Exception {
 
     Connector conn = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
 
     conn.tableOperations().create(tableName);
     conn.tableOperations().addConstraint(tableName, AlphaNumKeyConstraint.class.getName());
@@ -743,7 +743,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
     // test multiple mutations for same row in same batch
 
     Connector conn = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
 
     conn.tableOperations().create(tableName);
 
@@ -927,7 +927,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
   public void testThreads() throws Exception {
     // test multiple threads using a single conditional writer
 
-    String table = getTableNames(1)[0];
+    String table = getUniqueNames(1)[0];
     Connector conn = getConnector();
 
     conn.tableOperations().create(table);
@@ -1049,7 +1049,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
   public void testTimeout() throws Exception {
     Connector conn = getConnector();
 
-    String table = getTableNames(1)[0];
+    String table = getUniqueNames(1)[0];
 
     conn.tableOperations().create(table);
 
@@ -1096,7 +1096,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
 
   @Test(timeout = 60 * 1000)
   public void testDeleteTable() throws Exception {
-    String table = getTableNames(1)[0];
+    String table = getUniqueNames(1)[0];
     Connector conn = getConnector();
 
     try {
@@ -1126,7 +1126,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
 
   @Test(timeout = 60 * 1000)
   public void testOffline() throws Exception {
-    String table = getTableNames(1)[0];
+    String table = getUniqueNames(1)[0];
     Connector conn = getConnector();
 
     conn.tableOperations().create(table);
@@ -1158,7 +1158,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
 
   @Test(timeout = 60 * 1000)
   public void testError() throws Exception {
-    String table = getTableNames(1)[0];
+    String table = getUniqueNames(1)[0];
     Connector conn = getConnector();
 
     conn.tableOperations().create(table);
@@ -1185,7 +1185,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
 
   @Test(timeout = 60 * 1000, expected = IllegalArgumentException.class)
   public void testNoConditions() throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException {
-    String table = getTableNames(1)[0];
+    String table = getUniqueNames(1)[0];
     Connector conn = getConnector();
 
     conn.tableOperations().create(table);
@@ -1208,7 +1208,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
       UtilWaitThread.sleep(1000);
     }
     
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     conn.tableOperations().create(tableName);
     conn.tableOperations().deleteRows("trace", null, null);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java b/test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
index c116e30..c7892ce 100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
@@ -30,7 +30,7 @@ public class DeleteRowsIT extends SimpleMacIT {
   @Test(timeout = 5 * 60 * 1000)
   public void test() throws Exception {
     Connector c = getConnector();
-    String[] tableNames = this.getTableNames(20);
+    String[] tableNames = this.getUniqueNames(20);
     for (String tableName : tableNames) {
       c.tableOperations().create(tableName);
       c.tableOperations().deleteRows(tableName, null, null);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
index 7cb1fe5..6801b7f 100644
--- a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
@@ -66,7 +66,7 @@ public class MasterRepairsDualAssignmentIT extends ConfigurableMacIT {
     // make some tablets, spread 'em around
     Connector c = getConnector();
     Credentials creds = new Credentials("root", new PasswordToken(ROOT_PASSWORD));
-    String table = this.getTableNames(1)[0];
+    String table = this.getUniqueNames(1)[0];
     c.securityOperations().grantTablePermission("root", MetadataTable.NAME, TablePermission.WRITE);
     c.securityOperations().grantTablePermission("root", RootTable.NAME, TablePermission.WRITE);
     c.tableOperations().create(table);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java b/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java
index a2be168..10c7264 100644
--- a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java
@@ -88,7 +88,7 @@ public class NamespacesIT extends SimpleMacIT {
   public void setUpConnectorAndNamespace() throws Exception {
     // prepare a unique namespace and get a new root connector for each test
     c = getConnector();
-    namespace = "ns_" + getTableNames(1)[0];
+    namespace = "ns_" + getUniqueNames(1)[0];
   }
 
   @After

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java b/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java
index 64762de..f290ac1 100644
--- a/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java
@@ -60,7 +60,7 @@ public class SplitRecoveryIT extends SimpleMacIT {
   @Test(timeout = 60000)
   public void test() throws Exception {
 
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
 
     for (int tn = 0; tn < 2; tn++) {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/VolumeIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/VolumeIT.java b/test/src/test/java/org/apache/accumulo/test/VolumeIT.java
index c0e41c1..ab6af14 100644
--- a/test/src/test/java/org/apache/accumulo/test/VolumeIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/VolumeIT.java
@@ -109,7 +109,7 @@ public class VolumeIT extends ConfigurableMacIT {
   public void test() throws Exception {
     // create a table
     Connector connector = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     connector.tableOperations().create(tableName);
     SortedSet<Text> partitions = new TreeSet<Text>();
     // with some splits
@@ -173,7 +173,7 @@ public class VolumeIT extends ConfigurableMacIT {
     List<String> expected = new ArrayList<String>();
 
     Connector connector = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     connector.tableOperations().create(tableName, false);
 
     String tableId = connector.tableOperations().tableIdMap().get(tableName);
@@ -255,7 +255,7 @@ public class VolumeIT extends ConfigurableMacIT {
   @Test
   public void testAddVolumes() throws Exception {
 
-    String[] tableNames = getTableNames(2);
+    String[] tableNames = getUniqueNames(2);
 
     // grab this before shutting down cluster
     String uuid = new ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers()).getInstanceID();
@@ -299,7 +299,7 @@ public class VolumeIT extends ConfigurableMacIT {
   @Test
   public void testNonConfiguredVolumes() throws Exception {
 
-    String[] tableNames = getTableNames(2);
+    String[] tableNames = getUniqueNames(2);
 
     // grab this before shutting down cluster
     String uuid = new ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers()).getInstanceID();
@@ -435,7 +435,7 @@ public class VolumeIT extends ConfigurableMacIT {
 
   @Test(timeout = 5 * 60 * 1000)
   public void testRemoveVolumes() throws Exception {
-    String[] tableNames = getTableNames(2);
+    String[] tableNames = getUniqueNames(2);
 
     verifyVolumesUsed(tableNames[0], false, v1, v2);
 
@@ -476,7 +476,7 @@ public class VolumeIT extends ConfigurableMacIT {
   }
 
   private void testReplaceVolume(boolean cleanShutdown) throws Exception {
-    String[] tableNames = getTableNames(3);
+    String[] tableNames = getUniqueNames(3);
 
     verifyVolumesUsed(tableNames[0], false, v1, v2);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/AbstractMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AbstractMacIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AbstractMacIT.java
index aab3edb..ca7e587 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/AbstractMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/AbstractMacIT.java
@@ -76,7 +76,7 @@ public abstract class AbstractMacIT {
     return testDir;
   }
 
-  public String[] getTableNames(int num) {
+  public String[] getUniqueNames(int num) {
     if (num == 1)
       return new String[] {testName.getMethodName()};
     String[] names = new String[num];

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
index 3ebafff..17e319c 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
@@ -57,7 +57,7 @@ public class AccumuloInputFormatIT extends SimpleMacIT {
    */
   @Test
   public void testGetSplits() throws IOException, AccumuloSecurityException, AccumuloException, TableNotFoundException, TableExistsException {
-    String table = getTableNames(1)[0];
+    String table = getUniqueNames(1)[0];
     getConnector().tableOperations().create(table);
     insertData(table, currentTimeMillis());
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/AddSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AddSplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AddSplitIT.java
index 442d21e..cc2285e 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/AddSplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/AddSplitIT.java
@@ -42,7 +42,7 @@ public class AddSplitIT extends SimpleMacIT {
   @Test(timeout = 60 * 1000)
   public void addSplitTest() throws Exception {
 
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     Connector c = getConnector();
     c.tableOperations().create(tableName);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java
index 8d530a7..7c1f8a2 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java
@@ -54,7 +54,7 @@ public class BackupMasterIT extends ConfigurableMacIT {
       // kill the master by removing its lock
       writer.recursiveDelete(lockPath, NodeMissingPolicy.FAIL);
       // ensure the backup becomes the master
-      getConnector().tableOperations().create(getTableNames(1)[0]);
+      getConnector().tableOperations().create(getUniqueNames(1)[0]);
     } finally {
       backup.destroy();
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java
index c304b9b..a25e775 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java
@@ -42,7 +42,7 @@ public class BadIteratorMincIT extends SimpleMacIT {
   public void test() throws Exception {
     Connector c = getConnector();
 
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     IteratorSetting is = new IteratorSetting(30, BadIterator.class);
     c.tableOperations().attachIterator(tableName, is, EnumSet.of(IteratorScope.minc));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
index 1530689..22f0d98 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
@@ -50,7 +50,7 @@ public class BatchScanSplitIT extends ConfigurableMacIT {
   @Test(timeout = 2 * 60 * 1000)
   public void test() throws Exception {
     Connector c = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
 
     int numRows = 1 << 18;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
index e455075..34fb402 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
@@ -46,7 +46,7 @@ public class BatchWriterFlushIT extends SimpleMacIT {
   @Test(timeout = 90 * 1000)
   public void run() throws Exception {
     Connector c = getConnector();
-    String[] tableNames = getTableNames(2);
+    String[] tableNames = getUniqueNames(2);
     String bwft = tableNames[0];
     c.tableOperations().create(bwft);
     String bwlt = tableNames[1];

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
index eee093b..10fb7f4 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
@@ -45,7 +45,7 @@ public class BulkFileIT extends SimpleMacIT {
   @Test(timeout = 2 * 60 * 1000)
   public void testBulkFile() throws Exception {
     Connector c = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     SortedSet<Text> splits = new TreeSet<Text>();
     for (String split : "0333 0666 0999 1333 1666".split(" "))
@@ -55,7 +55,7 @@ public class BulkFileIT extends SimpleMacIT {
     AccumuloConfiguration aconf = ServerConfiguration.getDefaultConfiguration();
     FileSystem fs = TraceFileSystem.wrap(VolumeConfiguration.getDefaultVolume(conf, aconf).getFileSystem());
 
-    String dir = rootPath() + "/bulk_test_diff_files_89723987592_" + getTableNames(1)[0];
+    String dir = rootPath() + "/bulk_test_diff_files_89723987592_" + getUniqueNames(1)[0];
 
     fs.delete(new Path(dir), true);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/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 b0fa8e1..faa9391 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,7 +39,7 @@ public class BulkIT extends SimpleMacIT {
 
   @Test(timeout = 4 * 60 * 1000)
   public void test() throws Exception {
-    runTest(getConnector(), getTableNames(1)[0], this.getClass().getName(), testName.getMethodName());
+    runTest(getConnector(), getUniqueNames(1)[0], this.getClass().getName(), testName.getMethodName());
   }
 
   static void runTest(Connector c, String tableName, String filePrefix, String dirSuffix) throws AccumuloException, AccumuloSecurityException, TableExistsException, IOException, TableNotFoundException,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java
index 6f39dc5..adc49d9 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java
@@ -47,7 +47,7 @@ public class ClassLoaderIT extends SimpleMacIT {
   @Test(timeout = 2 * 60 * 1000)
   public void test() throws Exception {
     Connector c = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     BatchWriter bw = c.createBatchWriter(tableName, new BatchWriterConfig());
     Mutation m = new Mutation("row1");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java
index ec103f2..3ad9a3c 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java
@@ -51,7 +51,7 @@ public class CleanTmpIT extends ConfigurableMacIT {
   public void test() throws Exception {
     Connector c = getConnector();
     // make a table
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     // write to it
     BatchWriter bw = c.createBatchWriter(tableName, new BatchWriterConfig());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java
index ad5b2fd..2c878e3 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java
@@ -37,7 +37,7 @@ public class CleanUpIT extends SimpleMacIT {
   @Test(timeout = 30 * 1000)
   public void run() throws Exception {
 
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     getConnector().tableOperations().create(tableName);
 
     BatchWriter bw = getConnector().createBatchWriter(tableName, new BatchWriterConfig());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/CloneTestIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CloneTestIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CloneTestIT.java
index 38a764f..29f838b 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/CloneTestIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CloneTestIT.java
@@ -53,7 +53,7 @@ public class CloneTestIT extends SimpleMacIT {
 
   @Test(timeout = 120 * 1000)
   public void testProps() throws Exception {
-    String[] tableNames = getTableNames(2);
+    String[] tableNames = getUniqueNames(2);
     String table1 = tableNames[0];
     String table2 = tableNames[1];
 
@@ -134,7 +134,7 @@ public class CloneTestIT extends SimpleMacIT {
 
   @Test(timeout = 120 * 1000)
   public void testDeleteClone() throws Exception {
-    String[] tableNames = getTableNames(3);
+    String[] tableNames = getUniqueNames(3);
     String table1 = tableNames[0];
     String table2 = tableNames[1];
     String table3 = tableNames[2];

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/CombinerIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CombinerIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CombinerIT.java
index c3a7f38..be1a709 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/CombinerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CombinerIT.java
@@ -51,7 +51,7 @@ public class CombinerIT extends SimpleMacIT {
   @Test(timeout = 60 * 1000)
   public void aggregationTest() throws Exception {
     Connector c = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     IteratorSetting setting = new IteratorSetting(10, SummingCombiner.class);
     SummingCombiner.setEncodingType(setting, Type.STRING);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
index a465350..353fdb1 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
@@ -77,7 +77,7 @@ public class ConfigurableCompactionIT extends ConfigurableMacIT {
   @Test
   public void test() throws Exception {
     final Connector c = getConnector();
-    final String tableName = getTableNames(1)[0];
+    final String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     c.tableOperations().setProperty(tableName, Property.TABLE_COMPACTION_STRATEGY.getKey(), SimpleCompactionStrategy.class.getName());
     runTest(c, tableName, 3);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/ConstraintIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ConstraintIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ConstraintIT.java
index bf7906f..ef2212d 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ConstraintIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ConstraintIT.java
@@ -44,7 +44,7 @@ public class ConstraintIT extends SimpleMacIT {
 
   @Test(timeout = 30 * 1000)
   public void run() throws Exception {
-    String[] tableNames = getTableNames(3);
+    String[] tableNames = getUniqueNames(3);
     Connector c = getConnector();
     for (String table : tableNames) {
       c.tableOperations().create(table);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
index e0e93d5..3dbf5ce 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
@@ -49,7 +49,7 @@ public class CreateAndUseIT extends SimpleMacIT {
     Text cf = new Text("cf1");
     Text cq = new Text("cq1");
 
-    String[] tableNames = getTableNames(3);
+    String[] tableNames = getUniqueNames(3);
     String tableName = tableNames[0];
     getConnector().tableOperations().create(tableName);
     getConnector().tableOperations().addSplits(tableName, splits);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/CreateManyScannersIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CreateManyScannersIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CreateManyScannersIT.java
index 0c51f2a..e627218 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/CreateManyScannersIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CreateManyScannersIT.java
@@ -25,7 +25,7 @@ public class CreateManyScannersIT extends SimpleMacIT {
   @Test(timeout = 60 * 1000)
   public void run() throws Exception {
     Connector c = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     for (int i = 0; i < 100000; i++) {
       c.createScanner(tableName, Authorizations.EMPTY);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
index 3ab2768..0731e44 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
@@ -62,7 +62,7 @@ public class DeleteRowsIT extends SimpleMacIT {
     // Delete ranges of rows, and verify the tablets are removed.
     int i = 0;
     // Eliminate whole tablets
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     testSplit(tableName + i++, "f", "h", "abcdefijklmnopqrstuvwxyz", 260);
     // Eliminate whole tablets, partial first tablet
     testSplit(tableName + i++, "f1", "h", "abcdeff1ijklmnopqrstuvwxyz", 262);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java
index 1c26808..0a0b0b9 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java
@@ -57,7 +57,7 @@ public class DeleteRowsSplitIT extends SimpleMacIT {
   public void run() throws Exception {
     // Delete ranges of rows, and verify the are removed
     // Do this while adding many splits
-    final String tableName = getTableNames(1)[0];
+    final String tableName = getUniqueNames(1)[0];
 
     // Eliminate whole tablets
     for (int test = 0; test < 10; test++) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
index cf96302..cd69be7 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
@@ -35,7 +35,7 @@ public class DeleteTableDuringSplitIT extends SimpleMacIT {
   
   @Test(timeout= 10 * 60 * 1000)
   public void test() throws Exception {
-    String[] tableNames = getTableNames(100);
+    String[] tableNames = getUniqueNames(100);
     // make a bunch of tables
     for (String tableName : tableNames) {
       getConnector().tableOperations().create(tableName);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java b/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java
index cf16105..6ac2ef9 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java
@@ -33,7 +33,7 @@ public class FateStarvationIT extends SimpleMacIT {
 
   @Test(timeout = 2 * 60 * 1000)
   public void run() throws Exception {
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     Connector c = getConnector();
     c.tableOperations().create(tableName);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
index 8557625..f04f196 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
@@ -152,7 +152,7 @@ public class GarbageCollectorIT extends ConfigurableMacIT {
     killMacGc();
     // dirty metadata
     Connector c = getConnector();
-    String table = getTableNames(1)[0];
+    String table = getUniqueNames(1)[0];
     c.tableOperations().create(table);
     // let gc run for a bit
     cluster.start();
@@ -180,7 +180,7 @@ public class GarbageCollectorIT extends ConfigurableMacIT {
   public void testInvalidDelete() throws Exception {
     killMacGc();
 
-    String table = getTableNames(1)[0];
+    String table = getUniqueNames(1)[0];
     getConnector().tableOperations().create(table);
 
     BatchWriter bw2 = getConnector().createBatchWriter(table, new BatchWriterConfig());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
index 01bbd73..354a97d 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
@@ -39,7 +39,7 @@ public class MasterAssignmentIT extends SimpleMacIT {
   @Test(timeout=2*60*1000)
   public void test() throws Exception {
     Connector c = getConnector();
-    String tableName = super.getTableNames(1)[0];
+    String tableName = super.getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     String tableId = c.tableOperations().tableIdMap().get(tableName);
     // wait for the table to be online

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
index 27b4f27..80ea6b2 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
@@ -50,7 +50,7 @@ public class MergeIT extends SimpleMacIT {
   @Test(timeout = 60 * 1000)
   public void merge() throws Exception {
     Connector c = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     c.tableOperations().addSplits(tableName, splits("a b c d e f g h i j k".split(" ")));
     BatchWriter bw = c.createBatchWriter(tableName, null);
@@ -68,7 +68,7 @@ public class MergeIT extends SimpleMacIT {
   @Test(timeout = 60 * 1000)
   public void mergeSize() throws Exception {
     Connector c = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     c.tableOperations().addSplits(tableName, splits("a b c d e f g h i j k l m n o p q r s t u v w x y z".split(" ")));
     BatchWriter bw = c.createBatchWriter(tableName, null);
@@ -103,7 +103,7 @@ public class MergeIT extends SimpleMacIT {
   public void mergeTest() throws Exception {
     int tc = 0;
     Connector c = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     runMergeTest(c, tableName + tc++, ns(), ns(), ns("l", "m", "n"), ns(null, "l"), ns(null, "n"));
 
     runMergeTest(c, tableName + tc++, ns("m"), ns(), ns("l", "m", "n"), ns(null, "l"), ns(null, "n"));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/MetadataIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MetadataIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MetadataIT.java
index c4e33e4..00fbf7e 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MetadataIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MetadataIT.java
@@ -46,7 +46,7 @@ public class MetadataIT extends SimpleMacIT {
   @Test(timeout = 60 * 1000)
   public void testFlushAndCompact() throws Exception {
     Connector c = getConnector();
-    String tableNames[] = getTableNames(2);
+    String tableNames[] = getUniqueNames(2);
     
     // create a table to write some data to metadata table
     c.tableOperations().create(tableNames[0]);
@@ -103,7 +103,7 @@ public class MetadataIT extends SimpleMacIT {
   @Test(timeout = 2 * 60 * 1000)
   public void batchScanTest() throws Exception {
     Connector c = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
 
     // batch scan regular metadata table

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java b/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java
index f835015..d1c7190 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java
@@ -89,7 +89,7 @@ public class PermissionsIT extends SimpleMacIT {
       }
 
       // test permission before and after granting it
-      String tableNamePrefix = getTableNames(1)[0];
+      String tableNamePrefix = getUniqueNames(1)[0];
       testMissingSystemPermission(tableNamePrefix, c, test_user_conn, perm);
       c.securityOperations().grantSystemPermission(testUser, perm);
       verifyHasOnlyTheseSystemPermissions(c, testUser, perm);
@@ -389,7 +389,7 @@ public class PermissionsIT extends SimpleMacIT {
     // check for read-only access to metadata table
     verifyHasOnlyTheseTablePermissions(c, c.whoami(), MetadataTable.NAME, TablePermission.READ, TablePermission.ALTER_TABLE);
     verifyHasOnlyTheseTablePermissions(c, testUser, MetadataTable.NAME, TablePermission.READ);
-    String tableName = getTableNames(1)[0] + "__TABLE_PERMISSION_TEST__";
+    String tableName = getUniqueNames(1)[0] + "__TABLE_PERMISSION_TEST__";
 
     // test each permission
     for (TablePermission perm : TablePermission.values()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java
index 78b0537..135b4e0 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java
@@ -27,7 +27,7 @@ public class RenameIT extends SimpleMacIT {
 
   @Test(timeout = 2 * 60 * 1000)
   public void renameTest() throws Exception {
-    String[] tableNames = getTableNames(2);
+    String[] tableNames = getUniqueNames(2);
     String name1 = tableNames[0];
     String name2 = tableNames[1];
     BatchWriterOpts bwOpts = new BatchWriterOpts();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ScanIteratorIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
index 71b9964..c62592b 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
@@ -41,7 +41,7 @@ public class ScanIteratorIT extends SimpleMacIT {
 
   @Test(timeout = 30 * 1000)
   public void run() throws Exception {
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     Connector c = getConnector();
     c.tableOperations().create(tableName);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/ScanRangeIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ScanRangeIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ScanRangeIT.java
index dafbb7f..818cf92 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ScanRangeIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ScanRangeIT.java
@@ -42,7 +42,7 @@ public class ScanRangeIT extends SimpleMacIT {
   @Test(timeout = 2 * 60 * 1000)
   public void run() throws Exception {
     Connector c = getConnector();
-    String[] tableNames = getTableNames(2);
+    String[] tableNames = getUniqueNames(2);
     String table1 = tableNames[0];
     c.tableOperations().create(table1);
     String table2 = tableNames[1];

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java
index e6cf72b..e68514d 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java
@@ -41,7 +41,7 @@ public class ServerSideErrorIT extends SimpleMacIT {
   @Test(timeout = 2 * 60 * 1000)
   public void run() throws Exception {
     Connector c = getConnector();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     IteratorSetting is = new IteratorSetting(5, "Bad Aggregator", BadCombiner.class);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("acf")));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
index 3d31311..f43f458 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
@@ -30,6 +30,7 @@ import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 import org.apache.log4j.Logger;
 import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.BeforeClass;
 
 /**
@@ -65,6 +66,12 @@ public class SimpleMacIT extends AbstractMacIT {
     }
   }
 
+  @Before
+  public void logTestInfo() {
+    if (cluster != null)
+      log.debug("Running " + this.getClass().getSimpleName() + "." + testName.getMethodName() + "() in " + getFolder().getAbsolutePath());
+  }
+
   @Override
   public Connector getConnector() throws AccumuloException, AccumuloSecurityException {
     Connector conn = getInstanceOneConnector();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java
index 47db29a..a0d62b0 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java
@@ -38,7 +38,7 @@ public class SparseColumnFamilyIT extends SimpleMacIT {
 
   @Test(timeout = 60 * 1000)
   public void sparceColumnFamily() throws Exception {
-    String scftt = getTableNames(1)[0];
+    String scftt = getUniqueNames(1)[0];
     Connector c = getConnector();
     c.tableOperations().create(scftt);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/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 2464546..eec7d98 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(), testName.getMethodName());
+    BulkIT.runTest(getConnector(), getUniqueNames(1)[0], this.getClass().getName(), testName.getMethodName());
   }
 
   @Test(timeout = 60 * 1000)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java b/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
index 36c80f6..26021aa 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
@@ -45,7 +45,7 @@ public class TableIT extends SimpleMacIT {
   public void test() throws Exception {
     Connector c = getConnector();
     TableOperations to = c.tableOperations();
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     to.create(tableName);
     TestIngest.Opts opts = new TestIngest.Opts();
     opts.tableName = tableName;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/TabletIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/TabletIT.java b/test/src/test/java/org/apache/accumulo/test/functional/TabletIT.java
index 1dbcc99..9f7333d 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/TabletIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/TabletIT.java
@@ -54,7 +54,7 @@ public class TabletIT extends ConfigurableMacIT {
 
   @Test(timeout = 2 * 60 * 1000)
   public void createTableTest() throws Exception {
-    String tableName = getTableNames(1)[0];
+    String tableName = getUniqueNames(1)[0];
     createTableTest(tableName, false);
     createTableTest(tableName, true);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/TimeoutIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/TimeoutIT.java b/test/src/test/java/org/apache/accumulo/test/functional/TimeoutIT.java
index 34d605f..d949a5d 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/TimeoutIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/TimeoutIT.java
@@ -45,7 +45,7 @@ public class TimeoutIT extends SimpleMacIT {
   @Test(timeout = 75 * 1000)
   public void run() throws Exception {
     Connector conn = getConnector();
-    String[] tableNames = getTableNames(2);
+    String[] tableNames = getUniqueNames(2);
     testBatchWriterTimeout(conn, tableNames[0]);
     testBatchScannerTimeout(conn, tableNames[1]);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/VisibilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/VisibilityIT.java b/test/src/test/java/org/apache/accumulo/test/functional/VisibilityIT.java
index c98e080..044a29d 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/VisibilityIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/VisibilityIT.java
@@ -50,7 +50,7 @@ public class VisibilityIT extends SimpleMacIT {
   @Test(timeout = 2 * 60 * 1000)
   public void run() throws Exception {
     Connector c = getConnector();
-    String[] tableNames = getTableNames(2);
+    String[] tableNames = getUniqueNames(2);
     String table = tableNames[0];
     c.tableOperations().create(table);
     String table2 = tableNames[1];

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dda2fb06/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java b/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java
index a549920..ec481dd 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java
@@ -32,7 +32,7 @@ public class WriteLotsIT extends SimpleMacIT {
   @Test(timeout = 90 * 1000)
   public void writeLots() throws Exception {
     final Connector c = getConnector();
-    final String tableName = getTableNames(1)[0];
+    final String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     final AtomicReference<Exception> ref = new AtomicReference<Exception>();
     List<Thread> threads = new ArrayList<Thread>();


Mime
View raw message