accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [36/50] [abbrv] git commit: ACCUMULO-1537 fix static cluster/folder in MacTest
Date Wed, 17 Jul 2013 02:33:38 GMT
ACCUMULO-1537 fix static cluster/folder in MacTest

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502343 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/ACCUMULO-1496
Commit: 720e27a59a3a12ca70ee20d85eaf7c6afab83429
Parents: f43930d
Author: Eric C. Newton <ecn@apache.org>
Authored: Thu Jul 11 20:07:34 2013 +0000
Committer: Eric C. Newton <ecn@apache.org>
Committed: Thu Jul 11 20:07:34 2013 +0000

----------------------------------------------------------------------
 .../test/java/org/apache/accumulo/test/functional/DeleteIT.java | 5 +++--
 .../test/java/org/apache/accumulo/test/functional/MacTest.java  | 4 ++--
 .../test/java/org/apache/accumulo/test/functional/SplitIT.java  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/720e27a5/test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java
index 36c852e..08feb8a 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
 
 import org.apache.accumulo.core.cli.ScannerOpts;
 import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
 import org.apache.accumulo.server.util.Admin;
 import org.apache.accumulo.test.TestIngest;
 import org.apache.accumulo.test.TestRandomDeletes;
@@ -32,11 +33,11 @@ public class DeleteIT extends MacTest {
   public void test() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");
-    deleteTest(c);
+    deleteTest(c, cluster);
     assertEquals(0, cluster.exec(Admin.class, "stopAll").waitFor());
   }
 
-  public static void deleteTest(Connector c) throws Exception {
+  public static void deleteTest(Connector c, MiniAccumuloCluster cluster) throws Exception
{
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
     TestIngest.Opts opts = new TestIngest.Opts();
     vopts.rows = opts.rows = 1000;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/720e27a5/test/src/test/java/org/apache/accumulo/test/functional/MacTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MacTest.java b/test/src/test/java/org/apache/accumulo/test/functional/MacTest.java
index 0a288c5..a52d629 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MacTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MacTest.java
@@ -31,11 +31,11 @@ import org.junit.rules.TemporaryFolder;
 
 public class MacTest {
   public static final Logger log = Logger.getLogger(MacTest.class);
-  public static TemporaryFolder folder = new TemporaryFolder();
-  public static MiniAccumuloCluster cluster;
   public static final String PASSWORD = "secret";
   static final ScannerOpts SOPTS = new ScannerOpts();
   static final BatchWriterOpts BWOPTS = new BatchWriterOpts();
+  public TemporaryFolder folder = new TemporaryFolder();
+  public MiniAccumuloCluster cluster;
   
   public Connector getConnector() throws AccumuloException, AccumuloSecurityException {
     return cluster.getConnector("root", PASSWORD);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/720e27a5/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java
index e8a9d80..1be04b1 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java
@@ -101,7 +101,7 @@ public class SplitIT extends MacTest {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");
     c.tableOperations().setProperty("test_ingest", Property.TABLE_SPLIT_THRESHOLD.getKey(),
"10K");
-    DeleteIT.deleteTest(c);
+    DeleteIT.deleteTest(c, cluster);
     c.tableOperations().flush("test_ingest", null, null, true);
     UtilWaitThread.sleep(10*1000);
     assertTrue(c.tableOperations().listSplits("test_ingest").size() > 30);


Mime
View raw message