Index: pom.xml
===================================================================
--- pom.xml (revision 1554334)
+++ pom.xml (working copy)
@@ -1030,7 +1030,7 @@
6.1.14
1.8
1.6.5
- 4.10-HBASE-1
+ 4.11
1.4.3
1.2.16
1.8.5
Index: src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
===================================================================
--- src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java (revision 1554334)
+++ src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java (working copy)
@@ -367,8 +367,13 @@
}
}
}
+ 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();
- ZKUtil.createAndFailSilent(zk2, aclZnode);
}
/**
Index: src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
===================================================================
--- src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (revision 1554334)
+++ src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (working copy)
@@ -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;
@@ -380,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();
@@ -500,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);
}
/**
Index: src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
===================================================================
--- src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java (revision 1554334)
+++ src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java (working copy)
@@ -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);
Index: src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
===================================================================
--- src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java (revision 1554334)
+++ src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java (working copy)
@@ -71,8 +71,10 @@
import org.junit.AfterClass;
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 org.mockito.Mockito;
import org.mockito.internal.util.reflection.Whitebox;
@@ -82,6 +84,7 @@
/**
* Test {@link AssignmentManager}
*/
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@Category(MediumTests.class)
public class TestAssignmentManager {
private static final HBaseTestingUtility HTU = new HBaseTestingUtility();
Index: src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
===================================================================
--- src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java (revision 1554334)
+++ src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java (working copy)
@@ -27,7 +27,6 @@
import java.util.concurrent.atomic.AtomicLong;
import junit.framework.Assert;
-
import static org.junit.Assert.*;
import org.apache.commons.logging.Log;
@@ -50,10 +49,13 @@
import org.apache.zookeeper.ZooDefs.Ids;
import org.junit.After;
import org.junit.Before;
+import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.runners.MethodSorters;
import org.mockito.Mockito;
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@Category(MediumTests.class)
public class TestSplitLogManager {
private static final Log LOG = LogFactory.getLog(TestSplitLogManager.class);