You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@whirr.apache.org by to...@apache.org on 2011/05/24 06:01:44 UTC

svn commit: r1126860 - /incubator/whirr/branches/branch-0.5/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHBaseServiceTest.java

Author: tomwhite
Date: Tue May 24 04:01:44 2011
New Revision: 1126860

URL: http://svn.apache.org/viewvc?rev=1126860&view=rev
Log:
Merge -r 1126858:1126859 from trunk to branch-0.22. Re-instated commented out @AfterClass in test.

Modified:
    incubator/whirr/branches/branch-0.5/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHBaseServiceTest.java

Modified: incubator/whirr/branches/branch-0.5/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHBaseServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/branches/branch-0.5/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHBaseServiceTest.java?rev=1126860&r1=1126859&r2=1126860&view=diff
==============================================================================
--- incubator/whirr/branches/branch-0.5/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHBaseServiceTest.java (original)
+++ incubator/whirr/branches/branch-0.5/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHBaseServiceTest.java Tue May 24 04:01:44 2011
@@ -33,6 +33,7 @@ import org.apache.hadoop.hbase.thrift.ge
 import org.apache.hadoop.hbase.thrift.generated.TRowResult;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.whirr.service.hbase.integration.HBaseServiceController;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -54,7 +55,7 @@ public class CdhHBaseServiceTest {
     controller.ensureClusterRunning();
   }
 
-  //@AfterClass
+  @AfterClass
   public static void tearDown() throws Exception {
     controller.shutdown();
   }