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/08/02 22:33:46 UTC
[4/5] ACCUMULO-1537 make the IT a bit more stable
http://git-wip-us.apache.org/repos/asf/accumulo/blob/040f8912/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 3c6c91e..8b7a83a 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
@@ -36,7 +36,7 @@ import org.junit.Test;
*/
public class SparseColumnFamilyIT extends SimpleMacIT {
- @Test(timeout=30*1000)
+ @Test(timeout = 30 * 1000)
public void sparceColumnFamily() throws Exception {
String scftt = makeTableName();
Connector c = getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/040f8912/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 49ece93..761953a 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
@@ -52,7 +52,7 @@ public class SplitIT extends ConfigurableMacIT {
cfg.setSiteConfig(siteConfig);
}
- @Test(timeout = 120 * 1000)
+ @Test(timeout = 4 * 60 * 1000)
public void tabletShouldSplit() throws Exception {
Connector c = getConnector();
c.tableOperations().create("test_ingest");
@@ -85,7 +85,7 @@ public class SplitIT extends ConfigurableMacIT {
.waitFor());
}
- @Test(timeout = 60 * 1000)
+ @Test(timeout = 4 * 60 * 1000)
public void interleaveSplit() throws Exception {
Connector c = getConnector();
c.tableOperations().create("test_ingest");
@@ -96,7 +96,7 @@ public class SplitIT extends ConfigurableMacIT {
assertTrue(c.tableOperations().listSplits("test_ingest").size() > 20);
}
- @Test(timeout = 120 * 1000)
+ @Test(timeout = 4 * 60 * 1000)
public void deleteSplit() throws Exception {
Connector c = getConnector();
c.tableOperations().create("test_ingest");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/040f8912/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
index 78a4473..69f2808 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
@@ -22,7 +22,7 @@ import org.junit.Test;
public class SplitRecoveryIT extends SimpleMacIT {
- @Test(timeout=10*1000)
+ @Test(timeout = 10 * 1000)
public void test() throws Exception {
assertEquals(0, exec(SplitRecoveryTest.class).waitFor());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/040f8912/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java b/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java
index 3c1b98b..eeec941 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java
@@ -23,7 +23,7 @@ import org.junit.Test;
public class StartIT extends SimpleMacIT {
- @Test(timeout=10*1000)
+ @Test(timeout = 10 * 1000)
public void test() throws Exception {
assertTrue(exec(TestMain.class, "exception").waitFor() != 0);
assertEquals(0, exec(TestMain.class, "success").waitFor());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/040f8912/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 cda6c98..c3f8073 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
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.io.FileNotFoundException;
import java.util.Map.Entry;
import org.apache.accumulo.core.cli.BatchWriterOpts;
@@ -31,6 +32,7 @@ import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.test.TestIngest;
@@ -58,6 +60,7 @@ public class TableIT extends SimpleMacIT {
String id = to.tableIdMap().get(tableName);
Scanner s = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
s.setRange(new KeyExtent(new Text(id), null, null).toMetadataRange());
+ s.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
int count = 0;
for (@SuppressWarnings("unused")
Entry<Key,Value> entry : s) {
@@ -73,7 +76,11 @@ public class TableIT extends SimpleMacIT {
count++;
}
assertEquals(0, count);
- assertEquals(0, fs.listStatus(new Path(rootPath() + "/accumulo/tables/" + id)).length);
+ try {
+ assertEquals(0, fs.listStatus(new Path(rootPath() + "/accumulo/tables/" + id)).length);
+ } catch (FileNotFoundException ex) {
+ // that's fine, too
+ }
assertNull(to.tableIdMap().get(tableName));
to.create(tableName);
TestIngest.ingest(c, opts, new BatchWriterOpts());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/040f8912/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 4168f5a..f87a856 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
@@ -38,7 +38,7 @@ public class TabletIT extends ConfigurableMacIT {
cfg.setSiteConfig(siteConfig);
}
- @Test(timeout=30*1000)
+ @Test(timeout = 30 * 1000)
public void test() throws Exception {
assertEquals(0, cluster.exec(CreateTestTable.class, "" + N).waitFor());
assertEquals(0, cluster.exec(CreateTestTable.class, "-readonly", "" + N).waitFor());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/040f8912/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 fb542b8..4bae35c 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
@@ -42,7 +42,7 @@ import org.junit.Test;
*/
public class TimeoutIT extends SimpleMacIT {
- @Test(timeout=60*1000)
+ @Test(timeout = 60 * 1000)
public void run() throws Exception {
Connector conn = getConnector();
testBatchWriterTimeout(conn);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/040f8912/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 2bbc7a5..bde7883 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
@@ -46,7 +46,7 @@ import org.junit.Test;
public class VisibilityIT extends SimpleMacIT {
- @Test(timeout=30*1000)
+ @Test(timeout = 2 * 60 * 1000)
public void run() throws Exception {
Connector c = getConnector();
String table = makeTableName();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/040f8912/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 67144e4..a798709 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
@@ -48,7 +48,7 @@ public class WriteAheadLogIT extends ConfigurableMacIT {
cfg.useMiniDFS(true);
}
- @Test(timeout=100*1000)
+ @Test(timeout = 4 * 60 * 1000)
public void test() throws Exception {
Connector c = getConnector();
c.tableOperations().create("test_ingest");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/040f8912/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 752d843..5571a09 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
@@ -29,7 +29,7 @@ import org.junit.Test;
public class WriteLotsIT extends SimpleMacIT {
- @Test(timeout=20*1000)
+ @Test(timeout = 20 * 1000)
public void writeLots() throws Exception {
final Connector c = getConnector();
final String tableName = makeTableName();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/040f8912/test/src/test/java/org/apache/accumulo/test/functional/ZooCacheIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ZooCacheIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ZooCacheIT.java
index 96b3b55..44db530 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ZooCacheIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ZooCacheIT.java
@@ -26,7 +26,7 @@ import org.junit.Test;
public class ZooCacheIT extends SimpleMacIT {
- @Test(timeout=200*1000)
+ @Test(timeout = 2 * 60 *1000)
public void test() throws Exception {
assertEquals(0, exec(CacheTestClean.class, "/zcTest-42", "/tmp/zcTest-42").waitFor());
final AtomicReference<Exception> ref = new AtomicReference<Exception>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/040f8912/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 5f4eca9..8646e54 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
@@ -48,7 +48,7 @@ public class ZookeeperRestartIT extends ConfigurableMacIT {
cfg.setSiteConfig(siteConfig);
}
- @Test(timeout = 20 * 1000)
+ @Test(timeout = 2 * 60 * 1000)
public void test() throws Exception {
Connector c = getConnector();
c.tableOperations().create("test_ingest");