You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/07/23 20:22:02 UTC
[2/2] git commit: ACCUMULO-1537 applying Michael Berman's patches to
make switching between the different MacTest classes easier
ACCUMULO-1537 applying Michael Berman's patches to make switching between the different MacTest classes easier
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4661491d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4661491d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4661491d
Branch: refs/heads/master
Commit: 4661491d0b1de8fe4d5ce1d3534de01546bfb3df
Parents: 219f424
Author: Eric Newton <ec...@apache.org>
Authored: Tue Jul 23 14:22:10 2013 -0400
Committer: Eric Newton <ec...@apache.org>
Committed: Tue Jul 23 14:22:10 2013 -0400
----------------------------------------------------------------------
.../test/functional/BatchScanSplitIT.java | 2 +-
.../test/functional/BigRootTabletIT.java | 2 +-
.../accumulo/test/functional/BinaryIT.java | 2 +-
.../test/functional/BinaryStressIT.java | 2 +-
.../accumulo/test/functional/BloomFilterIT.java | 2 +-
.../functional/BulkSplitOptimizationIT.java | 4 +-
.../test/functional/ChaoticBlancerIT.java | 2 +-
.../accumulo/test/functional/CompactionIT.java | 2 +-
.../accumulo/test/functional/ConcurrencyIT.java | 2 +-
.../test/functional/DeleteEverythingIT.java | 2 +-
.../accumulo/test/functional/DeleteIT.java | 4 +-
.../test/functional/DynamicThreadPoolsIT.java | 4 +-
.../accumulo/test/functional/ExamplesIT.java | 10 ++--
.../test/functional/GarbageCollectorIT.java | 2 +-
.../test/functional/HalfDeadTServerIT.java | 4 +-
.../accumulo/test/functional/LargeRowIT.java | 2 +-
.../test/functional/LateLastContactIT.java | 2 +-
.../accumulo/test/functional/LogicalTimeIT.java | 2 +-
.../accumulo/test/functional/MacTest.java | 63 --------------------
.../accumulo/test/functional/MapReduceIT.java | 2 +-
.../test/functional/MasterFailoverIT.java | 2 +-
.../accumulo/test/functional/MaxOpenIT.java | 2 +-
.../test/functional/MetadataMaxFiles.java | 4 +-
.../test/functional/MetadataSplitIT.java | 2 +-
.../accumulo/test/functional/ReadWriteIT.java | 6 +-
.../accumulo/test/functional/RestartIT.java | 6 +-
.../test/functional/RestartStressIT.java | 4 +-
.../accumulo/test/functional/RowDeleteIT.java | 2 +-
.../test/functional/ScanSessionTimeOutIT.java | 2 +-
.../accumulo/test/functional/ShutdownIT.java | 14 ++---
.../functional/SimpleBalancerFairnessIT.java | 4 +-
.../accumulo/test/functional/SimpleMacIT.java | 38 ++----------
.../accumulo/test/functional/SplitIT.java | 4 +-
.../accumulo/test/functional/TabletIT.java | 2 +-
.../test/functional/WriteAheadLogIT.java | 2 +-
.../test/functional/ZookeeperRestartIT.java | 2 +-
36 files changed, 62 insertions(+), 151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/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 d02847c..1468249 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
@@ -38,7 +38,7 @@ import org.apache.accumulo.minicluster.MiniAccumuloConfig;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-public class BatchScanSplitIT extends MacTest {
+public class BatchScanSplitIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java
index bd36bef..55a879c 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java
@@ -32,7 +32,7 @@ import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.minicluster.MiniAccumuloConfig;
import org.junit.Test;
-public class BigRootTabletIT extends MacTest {
+public class BigRootTabletIT extends ConfigurableMacIT {
// ACCUMULO-542: A large root tablet will fail to load if it does't fit in the tserver scan buffers
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
index 0d110b9..872caf2 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
@@ -26,7 +26,7 @@ import org.apache.accumulo.test.TestBinaryRows;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-public class BinaryIT extends MacTest {
+public class BinaryIT extends ConfigurableMacIT {
@Test(timeout=60*1000)
public void test() throws Exception {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java
index 8c3af67..65917a5 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.junit.Test;
-public class BinaryStressIT extends MacTest {
+public class BinaryStressIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java
index 1c9ea53..2ba5ded 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java
@@ -44,7 +44,7 @@ import org.apache.accumulo.minicluster.MiniAccumuloConfig;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-public class BloomFilterIT extends MacTest {
+public class BloomFilterIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
index 59e2d42..7c0d7ee 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
@@ -35,7 +35,7 @@ import org.junit.Test;
*
*/
-public class BulkSplitOptimizationIT extends MacTest {
+public class BulkSplitOptimizationIT extends ConfigurableMacIT {
private static final String TABLE_NAME = "test_ingest";
@@ -79,7 +79,7 @@ public class BulkSplitOptimizationIT extends MacTest {
opts.rows = 100000;
opts.startRow = 0;
opts.cols = 1;
- opts.password = new Password(PASSWORD);
+ opts.password = new Password(ROOT_PASSWORD);
VerifyIngest.verifyIngest(c, opts, SOPTS);
// ensure each tablet does not have all map files
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/ChaoticBlancerIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ChaoticBlancerIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ChaoticBlancerIT.java
index 0e30a7a..7d5f377 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ChaoticBlancerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ChaoticBlancerIT.java
@@ -30,7 +30,7 @@ import org.apache.accumulo.test.VerifyIngest;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-public class ChaoticBlancerIT extends MacTest {
+public class ChaoticBlancerIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
index 5084f37..1d641cf 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
@@ -43,7 +43,7 @@ import org.apache.accumulo.test.VerifyIngest;
import org.apache.hadoop.fs.FileSystem;
import org.junit.Test;
-public class CompactionIT extends MacTest {
+public class CompactionIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java
index af5900b..9c6020c 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java
@@ -36,7 +36,7 @@ import org.apache.accumulo.minicluster.MiniAccumuloConfig;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-public class ConcurrencyIT extends MacTest {
+public class ConcurrencyIT extends ConfigurableMacIT {
static class ScanTask extends Thread {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java
index 78d8562..d16c1fb 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java
@@ -34,7 +34,7 @@ import org.apache.accumulo.minicluster.MiniAccumuloConfig;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-public class DeleteEverythingIT extends MacTest {
+public class DeleteEverythingIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/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 2e6bc4f..1e2a16e 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
@@ -27,7 +27,7 @@ import org.apache.accumulo.test.TestRandomDeletes;
import org.apache.accumulo.test.VerifyIngest;
import org.junit.Test;
-public class DeleteIT extends MacTest {
+public class DeleteIT extends ConfigurableMacIT {
@Test(timeout=60*1000)
public void test() throws Exception {
@@ -44,7 +44,7 @@ public class DeleteIT extends MacTest {
vopts.cols = opts.cols = 1;
vopts.random = opts.random = 56;
TestIngest.ingest(c, opts, BWOPTS);
- assertEquals(0, cluster.exec(TestRandomDeletes.class, "-u", "root", "-p", MacTest.PASSWORD, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers()).waitFor());
+ assertEquals(0, cluster.exec(TestRandomDeletes.class, "-u", "root", "-p", ROOT_PASSWORD, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers()).waitFor());
TestIngest.ingest(c, opts, BWOPTS);
VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
index daced3e..539122b 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
@@ -36,7 +36,7 @@ import org.apache.accumulo.test.TestIngest;
import org.apache.accumulo.trace.instrument.Tracer;
import org.junit.Test;
-public class DynamicThreadPoolsIT extends MacTest {
+public class DynamicThreadPoolsIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
@@ -57,7 +57,7 @@ public class DynamicThreadPoolsIT extends MacTest {
for (int i = 1; i < TABLES; i++)
c.tableOperations().clone("test_ingest", "test_ingest" + i, true, null, null);
UtilWaitThread.sleep(11*1000); // time between checks of the thread pool sizes
- TCredentials creds = CredentialHelper.create("root", new PasswordToken(MacTest.PASSWORD), c.getInstance().getInstanceName());
+ TCredentials creds = CredentialHelper.create("root", new PasswordToken(ROOT_PASSWORD), c.getInstance().getInstanceName());
for (int i = 1; i < TABLES; i++)
c.tableOperations().compact("test_ingest" + i, null, null, true, false);
for (int i = 0; i < 30; i++) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
index 6c846b4..ee56728 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
@@ -76,7 +76,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-public class ExamplesIT extends MacTest {
+public class ExamplesIT extends ConfigurableMacIT {
BatchWriterOpts bwOpts = new BatchWriterOpts();
@@ -91,7 +91,7 @@ public class ExamplesIT extends MacTest {
String instance = c.getInstance().getInstanceName();
String keepers = c.getInstance().getZooKeepers();
String user = "root";
- String passwd = MacTest.PASSWORD;
+ String passwd = ROOT_PASSWORD;
String visibility = "A|B";
String auths = "A,B";
BatchWriterConfig bwc = new BatchWriterConfig();
@@ -137,17 +137,17 @@ public class ExamplesIT extends MacTest {
c.tableOperations().create("bloom_test");
c.tableOperations().setProperty("bloom_test", Property.TABLE_BLOOM_ENABLED.getKey(), "true");
assertEquals(0, cluster.exec(RandomBatchWriter.class, "--seed", "7", "-i", instance, "-z",
- keepers, "-u", user, "-p", MacTest.PASSWORD, "--num", "100000", "--min", "0", "--max", "1000000000", "--size", "50",
+ keepers, "-u", user, "-p", ROOT_PASSWORD, "--num", "100000", "--min", "0", "--max", "1000000000", "--size", "50",
"--batchMemmory", "2M", "--batchLatency", "60s", "--batchThreads", "3", "-t", "bloom_test").waitFor());
c.tableOperations().flush("bloom_test", null, null, true);
long now = System.currentTimeMillis();
assertEquals(0, cluster.exec(RandomBatchScanner.class,"--seed", "7", "-i", instance, "-z",
- keepers, "-u", user, "-p", MacTest.PASSWORD, "--num", "10000", "--min", "0", "--max", "1000000000", "--size", "50",
+ keepers, "-u", user, "-p", ROOT_PASSWORD, "--num", "10000", "--min", "0", "--max", "1000000000", "--size", "50",
"--scanThreads", "4","-t", "bloom_test").waitFor());
long diff = System.currentTimeMillis() - now;
now = System.currentTimeMillis();
assertEquals(0, cluster.exec(RandomBatchScanner.class,"--seed", "8", "-i", instance, "-z",
- keepers, "-u", user, "-p", MacTest.PASSWORD, "--num", "10000", "--min", "0", "--max", "1000000000", "--size", "50",
+ keepers, "-u", user, "-p", ROOT_PASSWORD, "--num", "10000", "--min", "0", "--max", "1000000000", "--size", "50",
"--scanThreads", "4","-t", "bloom_test").waitFor());
long diff2 = System.currentTimeMillis() - now;
assertTrue(diff2 < diff);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/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 ebaca28..9cc70be 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
@@ -44,7 +44,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-public class GarbageCollectorIT extends MacTest {
+public class GarbageCollectorIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java b/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
index e058ed3..4ea5bf0 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
@@ -41,7 +41,7 @@ import org.apache.accumulo.test.TestIngest;
import org.apache.accumulo.test.VerifyIngest;
import org.junit.Test;
-public class HalfDeadTServerIT extends MacTest {
+public class HalfDeadTServerIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
@@ -132,7 +132,7 @@ public class HalfDeadTServerIT extends MacTest {
c.tableOperations().create("test_ingest");
assertEquals(1, c.instanceOperations().getTabletServers().size());
int rows = 100*1000;
- Process ingest = cluster.exec(TestIngest.class, "-u", "root", "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-p", MacTest.PASSWORD, "--rows", rows + "");
+ Process ingest = cluster.exec(TestIngest.class, "-u", "root", "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-p", ROOT_PASSWORD, "--rows", rows + "");
UtilWaitThread.sleep(500);
// block I/O with some side-channel trickiness
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java b/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
index 4777659..90f77e7 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
@@ -38,7 +38,7 @@ import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
import org.junit.Test;
-public class LargeRowIT extends MacTest {
+public class LargeRowIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java b/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java
index 24db37c..bd313d6 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java
@@ -28,7 +28,7 @@ import org.junit.Test;
* Fake the "tablet stops talking but holds its lock" problem we see when hard drives and NFS fail.
* Start a ZombieTServer, and see that master stops it.
*/
-public class LateLastContactIT extends MacTest {
+public class LateLastContactIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java b/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
index fafb57a..fbc9c00 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
@@ -29,7 +29,7 @@ import org.apache.accumulo.core.security.Authorizations;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-public class LogicalTimeIT extends MacTest {
+public class LogicalTimeIT extends ConfigurableMacIT {
@Test(timeout=120*1000)
public void run() throws Exception {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/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
deleted file mode 100644
index 19dfa6b..0000000
--- a/test/src/test/java/org/apache/accumulo/test/functional/MacTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.test.functional;
-
-import org.apache.accumulo.core.cli.BatchWriterOpts;
-import org.apache.accumulo.core.cli.ScannerOpts;
-import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.minicluster.MiniAccumuloCluster;
-import org.apache.accumulo.minicluster.MiniAccumuloConfig;
-import org.apache.log4j.Logger;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.rules.TemporaryFolder;
-
-public class MacTest {
- public static final Logger log = Logger.getLogger(MacTest.class);
- public static final String PASSWORD = "secret";
- public static final ScannerOpts SOPTS = new ScannerOpts();
- public 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);
- }
-
- @Before
- public void setUp() throws Exception {
- folder.create();
- MiniAccumuloConfig cfg = new MiniAccumuloConfig(folder.newFolder(this.getClass().getSimpleName()), PASSWORD);
- configure(cfg);
- cluster = new MiniAccumuloCluster(cfg);
- cluster.start();
- }
-
- public void configure(MiniAccumuloConfig cfg) {
- }
-
- @After
- public void tearDown() throws Exception {
- if (cluster != null)
- cluster.stop();
- folder.delete();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java
index 839d51d..7265a3b 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java
@@ -59,7 +59,7 @@ public class MapReduceIT extends SimpleMacIT {
"-i", c.getInstance().getInstanceName(),
"-z", c.getInstance().getZooKeepers(),
"-u", "root",
- "-p", MacTest.PASSWORD,
+ "-p", ROOT_PASSWORD,
"-t", tablename,
"--column", input_cfcq);
assertEquals(0, hash.waitFor());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
index 9934874..4ca383a 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
@@ -28,7 +28,7 @@ import org.apache.accumulo.test.TestIngest;
import org.apache.accumulo.test.VerifyIngest;
import org.junit.Test;
-public class MasterFailoverIT extends MacTest {
+public class MasterFailoverIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java
index f5cc2cf..1411059 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java
@@ -39,7 +39,7 @@ import org.junit.Test;
* A functional test that exercises hitting the max open file limit on a tablet server. This test assumes there are one or two tablet servers.
*/
-public class MaxOpenIT extends MacTest {
+public class MaxOpenIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java b/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java
index 77e6b22..fd0a2a8 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java
@@ -43,7 +43,7 @@ import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-public class MetadataMaxFiles extends MacTest {
+public class MetadataMaxFiles extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
@@ -82,7 +82,7 @@ public class MetadataMaxFiles extends MacTest {
while (true) {
MasterMonitorInfo stats = null;
- TCredentials creds = CredentialHelper.create("root", new PasswordToken(MacTest.PASSWORD), c.getInstance().getInstanceName());
+ TCredentials creds = CredentialHelper.create("root", new PasswordToken(ROOT_PASSWORD), c.getInstance().getInstanceName());
Client client = null;
try {
client = MasterClient.getConnectionWithRetry(c.getInstance());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/MetadataSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MetadataSplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MetadataSplitIT.java
index b18324a..e2bb432 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MetadataSplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MetadataSplitIT.java
@@ -28,7 +28,7 @@ import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.minicluster.MiniAccumuloConfig;
import org.junit.Test;
-public class MetadataSplitIT extends MacTest {
+public class MetadataSplitIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index e6d08a6..049eb0f 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@ -55,7 +55,7 @@ import org.apache.accumulo.test.VerifyIngest;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-public class ReadWriteIT extends MacTest {
+public class ReadWriteIT extends ConfigurableMacIT {
static final int ROWS = 200000;
static final int COLS = 1;
@@ -121,8 +121,8 @@ public class ReadWriteIT extends MacTest {
// Write to multiple tables
String instance = cluster.getInstanceName();
String keepers = cluster.getZooKeepers();
- TestMultiTableIngest.main(args("--count", "" + ROWS, "-u", "root", "-i", instance, "-z", keepers, "-p", PASSWORD));
- TestMultiTableIngest.main(args("--count", "" + ROWS, "--readonly", "-u", "root", "-i", instance, "-z", keepers, "-p", PASSWORD));
+ TestMultiTableIngest.main(args("--count", "" + ROWS, "-u", "root", "-i", instance, "-z", keepers, "-p", ROOT_PASSWORD));
+ TestMultiTableIngest.main(args("--count", "" + ROWS, "--readonly", "-u", "root", "-i", instance, "-z", keepers, "-p", ROOT_PASSWORD));
}
@Test(timeout = 60 * 1000)
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
index d229ca7..e33517c 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
@@ -38,7 +38,7 @@ import org.apache.accumulo.test.TestIngest;
import org.apache.accumulo.test.VerifyIngest;
import org.junit.Test;
-public class RestartIT extends MacTest {
+public class RestartIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
cfg.setSiteConfig(Collections.singletonMap(Property.INSTANCE_ZK_TIMEOUT.getKey(), "5s"));
@@ -54,7 +54,7 @@ public class RestartIT extends MacTest {
Connector c = getConnector();
c.tableOperations().create("test_ingest");
Process ingest = cluster.exec(TestIngest.class,
- "-u", "root", "-p", MacTest.PASSWORD,
+ "-u", "root", "-p", ROOT_PASSWORD,
"-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers());
for (ProcessReference master : cluster.getProcesses().get(ServerType.MASTER)) {
cluster.killProcess(ServerType.MASTER, master);
@@ -91,7 +91,7 @@ public class RestartIT extends MacTest {
c.tableOperations().create("test_ingest");
c.tableOperations().setProperty("test_ingest", Property.TABLE_SPLIT_THRESHOLD.getKey(), "5K");
Process ingest = cluster.exec(TestIngest.class,
- "-u", "root", "-p", MacTest.PASSWORD,
+ "-u", "root", "-p", ROOT_PASSWORD,
"-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers());
for (ProcessReference master : cluster.getProcesses().get(ServerType.MASTER)) {
cluster.killProcess(ServerType.MASTER, master);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java
index ca4abb5..1904d70 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java
@@ -31,7 +31,7 @@ import org.apache.accumulo.test.TestIngest;
import org.apache.accumulo.test.VerifyIngest;
import org.junit.Test;
-public class RestartStressIT extends MacTest {
+public class RestartStressIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
@@ -59,7 +59,7 @@ public class RestartStressIT extends MacTest {
c.tableOperations().create("test_ingest");
c.tableOperations().setProperty("test_ingest", Property.TABLE_SPLIT_THRESHOLD.getKey(), "5K");
Process ingest = cluster.exec(TestIngest.class,
- "-u", "root", "-p", MacTest.PASSWORD,
+ "-u", "root", "-p", ROOT_PASSWORD,
"-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(),
"--rows", "" + IOPTS.rows);
for (int i = 0; i < 2; i++) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java
index 40e6f02..b1a45bc 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java
@@ -41,7 +41,7 @@ import org.apache.accumulo.minicluster.MiniAccumuloConfig;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-public class RowDeleteIT extends MacTest {
+public class RowDeleteIT extends ConfigurableMacIT {
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
index 6d066a6..4134dca 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
@@ -34,7 +34,7 @@ import org.apache.accumulo.minicluster.MiniAccumuloConfig;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-public class ScanSessionTimeOutIT extends MacTest {
+public class ScanSessionTimeOutIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java
index cfa2d15..09e2fc2 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java
@@ -30,11 +30,11 @@ import org.apache.accumulo.test.TestRandomDeletes;
import org.apache.accumulo.test.VerifyIngest;
import org.junit.Test;
-public class ShutdownIT extends MacTest {
+public class ShutdownIT extends ConfigurableMacIT {
@Test(timeout=60*1000)
public void shutdownDuringIngest() throws Exception {
- Process ingest = cluster.exec(TestIngest.class, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-p", MacTest.PASSWORD, "--createTable");
+ Process ingest = cluster.exec(TestIngest.class, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-p", ROOT_PASSWORD, "--createTable");
UtilWaitThread.sleep(100);
assertEquals(0, cluster.exec(Admin.class, "stopAll").waitFor());
ingest.destroy();
@@ -42,8 +42,8 @@ public class ShutdownIT extends MacTest {
@Test(timeout=60*1000)
public void shutdownDuringQuery() throws Exception {
- assertEquals(0, cluster.exec(TestIngest.class, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-p", MacTest.PASSWORD, "--createTable").waitFor());
- Process verify = cluster.exec(VerifyIngest.class, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-p", MacTest.PASSWORD);
+ assertEquals(0, cluster.exec(TestIngest.class, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-p", ROOT_PASSWORD, "--createTable").waitFor());
+ Process verify = cluster.exec(VerifyIngest.class, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-p", ROOT_PASSWORD);
UtilWaitThread.sleep(100);
assertEquals(0, cluster.exec(Admin.class, "stopAll").waitFor());
verify.destroy();
@@ -51,8 +51,8 @@ public class ShutdownIT extends MacTest {
@Test(timeout=60*1000)
public void shutdownDuringDelete() throws Exception {
- assertEquals(0, cluster.exec(TestIngest.class, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-p", MacTest.PASSWORD, "--createTable").waitFor());
- Process deleter = cluster.exec(TestRandomDeletes.class, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-p", MacTest.PASSWORD);
+ assertEquals(0, cluster.exec(TestIngest.class, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-p", ROOT_PASSWORD, "--createTable").waitFor());
+ Process deleter = cluster.exec(TestRandomDeletes.class, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-p", ROOT_PASSWORD);
UtilWaitThread.sleep(100);
assertEquals(0, cluster.exec(Admin.class, "stopAll").waitFor());
deleter.destroy();
@@ -91,7 +91,7 @@ public class ShutdownIT extends MacTest {
@Test(timeout=30*1000)
public void adminStop() throws Exception {
Connector c = getConnector();
- assertEquals(0, cluster.exec(TestIngest.class, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-p", MacTest.PASSWORD, "--createTable").waitFor());
+ assertEquals(0, cluster.exec(TestIngest.class, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-p", ROOT_PASSWORD, "--createTable").waitFor());
List<String> tabletServers = c.instanceOperations().getTabletServers();
assertEquals(2, tabletServers.size());
String doomed = tabletServers.get(0);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
index 620dc47..8278b2a 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
@@ -40,7 +40,7 @@ import org.apache.accumulo.test.TestIngest;
import org.apache.accumulo.trace.instrument.Tracer;
import org.junit.Test;
-public class SimpleBalancerFairnessIT extends MacTest {
+public class SimpleBalancerFairnessIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
@@ -63,7 +63,7 @@ public class SimpleBalancerFairnessIT extends MacTest {
TestIngest.ingest(c, opts, new BatchWriterOpts());
c.tableOperations().flush("test_ingest", null, null, false);
UtilWaitThread.sleep(15*1000);
- TCredentials creds = CredentialHelper.create("root", new PasswordToken(MacTest.PASSWORD), c.getInstance().getInstanceName());
+ TCredentials creds = CredentialHelper.create("root", new PasswordToken(ROOT_PASSWORD), c.getInstance().getInstanceName());
MasterClientService.Iface client = null;
MasterMonitorInfo stats = null;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/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 f996094..2be6677 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
@@ -16,14 +16,6 @@
*/
package org.apache.accumulo.test.functional;
-import java.io.IOException;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.accumulo.core.cli.BatchWriterOpts;
-import org.apache.accumulo.core.cli.ScannerOpts;
-import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.minicluster.MiniAccumuloCluster;
import org.apache.accumulo.minicluster.MiniAccumuloConfig;
import org.apache.log4j.Logger;
@@ -31,18 +23,12 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.rules.TemporaryFolder;
-public class SimpleMacIT {
+public class SimpleMacIT extends AbstractMacIT {
public static final Logger log = Logger.getLogger(SimpleMacIT.class);
- public static final String ROOT_PASSWORD = "secret";
-
static private TemporaryFolder folder = new TemporaryFolder();
static private MiniAccumuloCluster cluster;
- public static Connector getConnector() throws AccumuloException, AccumuloSecurityException {
- return cluster.getConnector("root", ROOT_PASSWORD);
- }
-
@BeforeClass
synchronized public static void setUp() throws Exception {
if (cluster == null) {
@@ -53,30 +39,18 @@ public class SimpleMacIT {
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
- folder.delete();
+ cleanUp(cluster, folder);
}
});
}
}
+ @Override
+ public MiniAccumuloCluster getCluster() {
+ return cluster;
+ }
@AfterClass
public static void tearDown() throws Exception {
}
-
- static AtomicInteger tableCount = new AtomicInteger();
- static public String makeTableName() {
- return "table" + tableCount.getAndIncrement();
- }
-
- static public String rootPath() {
- return cluster.getConfig().getDir().getAbsolutePath();
- }
-
- static Process exec(Class<? extends Object> clazz, String... args) throws IOException {
- return cluster.exec(clazz, args);
- }
-
- public static BatchWriterOpts BWOPTS = MacTest.BWOPTS;
- public static ScannerOpts SOPTS = MacTest.SOPTS;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/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 afb14d8..49ece93 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
@@ -42,7 +42,7 @@ import org.apache.accumulo.test.VerifyIngest;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-public class SplitIT extends MacTest {
+public class SplitIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
@@ -81,7 +81,7 @@ public class SplitIT extends MacTest {
assertTrue(shortened > 0);
assertTrue(count > 10);
assertEquals(0,
- cluster.exec(CheckForMetadataProblems.class, "-i", cluster.getInstanceName(), "-u", "root", "-p", MacTest.PASSWORD, "-z", cluster.getZooKeepers())
+ cluster.exec(CheckForMetadataProblems.class, "-i", cluster.getInstanceName(), "-u", "root", "-p", ROOT_PASSWORD, "-z", cluster.getZooKeepers())
.waitFor());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/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 f222a04..4168f5a 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
@@ -26,7 +26,7 @@ import org.apache.accumulo.minicluster.MiniAccumuloConfig;
import org.apache.accumulo.test.CreateTestTable;
import org.junit.Test;
-public class TabletIT extends MacTest {
+public class TabletIT extends ConfigurableMacIT {
private static final int N = 1000;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java b/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
index 8149c5f..67144e4 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
@@ -34,7 +34,7 @@ import org.apache.accumulo.test.TestIngest;
import org.apache.accumulo.test.VerifyIngest;
import org.junit.Test;
-public class WriteAheadLogIT extends MacTest {
+public class WriteAheadLogIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4661491d/test/src/test/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java
index f718a63..5f4eca9 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java
@@ -39,7 +39,7 @@ import org.apache.accumulo.minicluster.ProcessReference;
import org.apache.accumulo.minicluster.ServerType;
import org.junit.Test;
-public class ZookeeperRestartIT extends MacTest {
+public class ZookeeperRestartIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfig cfg) {