svn commit: r1554567 - in /hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase: TestZooKeeper.java client/TestAdmin.java client/TestMultiParallel.java

[larsh]

Author: larsh
Date: Tue Dec 31 19:03:43 2013
New Revision: 1554567

URL: http://svn.apache.org/r1554567
Log:
More test fixes

Modified:
    
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
    
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
    
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java

Modified: 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java?rev=1554567&r1=1554566&r2=1554567&view=diff
==============================================================================
--- 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
 (original)
+++ 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
 Tue Dec 31 19:03:43 2013
@@ -367,8 +367,13 @@ public class TestZooKeeper {
         }
       }
     }
-    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();
  }
   
   /**

Modified: 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java?rev=1554567&r1=1554566&r2=1554567&view=diff
==============================================================================
--- 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
 (original)
+++ 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
 Tue Dec 31 19:03:43 2013
@@ -27,8 +27,6 @@ import static org.junit.Assert.fail;
 
 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.AfterClass;
 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 @@ import org.junit.runners.MethodSorters;
  * 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 @@ public class TestAdmin {
   @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 @@ public class TestAdmin {
       expectedException = true;
     }
     assertTrue("Online schema update should not happen.", expectedException);
+    TEST_UTIL.getMiniHBaseCluster().getMaster().getConfiguration().setBoolean(
+        "hbase.online.schema.update.enable", true);
   }
 
   /**

Modified: 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java?rev=1554567&r1=1554566&r2=1554567&view=diff
==============================================================================
--- 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
 (original)
+++ 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
 Tue Dec 31 19:03:43 2013
@@ -34,11 +34,14 @@ import org.junit.AfterClass;
 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 @@ public class TestMultiParallel {
   }
 
   @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);