More test fixes
git-svn-id: https://svn.apache.org/repos/asf/hbase/tags/0.94.15-junit-4.11@1554567 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java b/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
index 1ee0500..1359ac1 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
@@ -367,8 +367,13 @@
}
}
}
- zk.close();
ZKUtil.createAndFailSilent(zk2, aclZnode);
+
+ // reset /'s ACL for tests that follow
+ zk = new ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);
+ zk.addAuthInfo("digest", "hbase:rox".getBytes());
+ zk.setACL("/", ZooDefs.Ids.OPEN_ACL_UNSAFE, -1);
+ zk.close();
}
/**
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java b/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
index 92800e0..c445433 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
@@ -27,8 +27,6 @@
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -71,10 +69,8 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.runners.MethodSorters;
/**
@@ -82,7 +78,6 @@
* Spins up the minicluster once at test start and then takes it down afterward.
* Add any testing of HBaseAdmin functionality here.
*/
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@Category(LargeTests.class)
public class TestAdmin {
final Log LOG = LogFactory.getLog(getClass());
@@ -383,8 +378,6 @@
@Test
public void testOnlineChangeTableSchema() throws IOException, InterruptedException {
final byte [] tableName = Bytes.toBytes("changeTableSchemaOnline");
- TEST_UTIL.getMiniHBaseCluster().getMaster().getConfiguration().setBoolean(
- "hbase.online.schema.update.enable", true);
HTableDescriptor [] tables = admin.listTables();
int numTables = tables.length;
TEST_UTIL.createTable(tableName, HConstants.CATALOG_FAMILY).close();
@@ -503,6 +496,8 @@
expectedException = true;
}
assertTrue("Online schema update should not happen.", expectedException);
+ TEST_UTIL.getMiniHBaseCluster().getMaster().getConfiguration().setBoolean(
+ "hbase.online.schema.update.enable", true);
}
/**
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java b/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
index ae5ff1f..57135b2 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
@@ -34,11 +34,14 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.runners.MethodSorters;
import static org.junit.Assert.*;
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@Category(MediumTests.class)
public class TestMultiParallel {
private static final Log LOG = LogFactory.getLog(TestMultiParallel.class);
@@ -290,7 +293,9 @@
}
@Test (timeout=300000)
- public void testBatchWithPut() throws Exception {
+ // FIXME: sort test lexicographically to the end.
+ // otherwise clashed with testFlushCommitsWithAbort
+ public void testZBatchWithPut() throws Exception {
LOG.info("test=testBatchWithPut");
HTable table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
