You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jg...@apache.org on 2010/07/07 05:37:33 UTC

svn commit: r961064 - in /hbase/branches/0.90_master_rewrite: BRANCH_CHANGES.txt src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java

Author: jgray
Date: Wed Jul  7 03:37:31 2010
New Revision: 961064

URL: http://svn.apache.org/viewvc?rev=961064&view=rev
Log:
HBASE-2696  Re-enabled TestZooKeeper.testRegionServerSessionExpired

Modified:
    hbase/branches/0.90_master_rewrite/BRANCH_CHANGES.txt
    hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java

Modified: hbase/branches/0.90_master_rewrite/BRANCH_CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/BRANCH_CHANGES.txt?rev=961064&r1=961063&r2=961064&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/BRANCH_CHANGES.txt (original)
+++ hbase/branches/0.90_master_rewrite/BRANCH_CHANGES.txt Wed Jul  7 03:37:31 2010
@@ -11,6 +11,7 @@ Branch 0.90.0 - Master Rewrite Branch
                 (Karthik R via jgray)
     HBASE-2696  [part1-v5-NewClasses_RS_Tested] ZooKeeper cleanup
                 and refactor
+    HBASE-2696  Re-enabled TestZooKeeper.testRegionServerSessionExpired
 
   NEW FEATURES
 

Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java?rev=961064&r1=961063&r2=961064&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java Wed Jul  7 03:37:31 2010
@@ -112,15 +112,15 @@ public class TestZooKeeper {
     connection.relocateRegion(HConstants.ROOT_TABLE_NAME, HConstants.EMPTY_BYTE_ARRAY);
   }
   
-//  @Test Disabled, we don't expect these to restart anymore
-  public void disabledTestRegionServerSessionExpired() throws Exception{
+  @Test
+  public void testRegionServerSessionExpired() throws Exception {
     LOG.info("Starting testRegionServerSessionExpired");
     new HTable(conf, HConstants.META_TABLE_NAME);
     TEST_UTIL.expireRegionServerSession(0);
     testSanity();
   }
 
-//@Test Disabled, we don't expect these to restart anymore
+  //@Test
   public void disabledTestMasterSessionExpired() throws Exception {
     LOG.info("Starting testMasterSessionExpired");
     new HTable(conf, HConstants.META_TABLE_NAME);