You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/04/03 23:44:50 UTC

[1/2] git commit: ACCUMULO-2620 Make table names more unique and cleanup unused field.

Repository: accumulo
Updated Branches:
  refs/heads/master f8ca8d34d -> 61de68009


ACCUMULO-2620 Make table names more unique and cleanup unused field.

Support parallel tests better with more better uniqueness in table names.


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

Branch: refs/heads/master
Commit: 2c1454e73f50a1e5fa2183deb193f58d6a8337a8
Parents: aaa8afb
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Apr 3 11:11:50 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Apr 3 11:11:50 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/test/functional/AbstractMacIT.java | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2c1454e7/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 ca7e587..352470c 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
@@ -19,7 +19,6 @@ package org.apache.accumulo.test.functional;
 import java.io.File;
 import java.util.Map;
 import java.util.Random;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.accumulo.core.cli.BatchWriterOpts;
 import org.apache.accumulo.core.cli.ScannerOpts;
@@ -52,8 +51,6 @@ public abstract class AbstractMacIT {
       } catch (Exception e) {}
   }
 
-  static AtomicInteger tableCount = new AtomicInteger();
-
   protected static File createSharedTestDir(String name) {
     File baseDir = new File(System.getProperty("user.dir") + "/target/mini-tests");
     baseDir.mkdirs();
@@ -77,8 +74,6 @@ public abstract class AbstractMacIT {
   }
 
   public String[] getUniqueNames(int num) {
-    if (num == 1)
-      return new String[] {testName.getMethodName()};
     String[] names = new String[num];
     for (int i = 0; i < num; i++)
       names[i] = this.getClass().getSimpleName() + "_" + testName.getMethodName() + i;


[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by ct...@apache.org.
Merge branch '1.6.0-SNAPSHOT'


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

Branch: refs/heads/master
Commit: 61de680092e74333958c36e091bd50a501f539a1
Parents: f8ca8d3 2c1454e
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Apr 3 17:44:41 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Apr 3 17:44:41 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/test/functional/AbstractMacIT.java | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------