svn commit: r1445799 - /hbase/branches/hbase-7290/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotDescriptionUtils.java

[jm...@apache.org]

Author: jmhsieh
Date: Wed Feb 13 18:22:06 2013
New Revision: 1445799

URL: http://svn.apache.org/r1445799
Log:
HBASE-7430 TestSnapshotDescriptionUtils break compaction/scanner tests (EnvironmentEdge issue) (Matteo Bertozzi)


Modified:
    hbase/branches/hbase-7290/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotDescriptionUtils.java

Modified: hbase/branches/hbase-7290/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotDescriptionUtils.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotDescriptionUtils.java?rev=1445799&r1=1445798&r2=1445799&view=diff
==============================================================================
--- hbase/branches/hbase-7290/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotDescriptionUtils.java (original)
+++ hbase/branches/hbase-7290/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotDescriptionUtils.java Wed Feb 13 18:22:06 2013
@@ -29,7 +29,7 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.MediumTests;
 import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
 import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type;
 import org.apache.hadoop.hbase.util.EnvironmentEdge;
@@ -42,7 +42,7 @@ import org.junit.experimental.categories
 /**
  * Test that the {@link SnapshotDescription} helper is helping correctly.
  */
-@Category(SmallTests.class)
+@Category(MediumTests.class)
 public class TestSnapshotDescriptionUtils {
   private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
   private static FileSystem fs;
@@ -57,13 +57,14 @@ public class TestSnapshotDescriptionUtil
   @After
   public void cleanupFS() throws Exception {
     if (fs.exists(root)) {
-    if (!fs.delete(root, true)) {
-      throw new IOException("Failed to delete root test dir: " + root);
-    }
-    if (!fs.mkdirs(root)) {
-      throw new IOException("Failed to create root test dir: " + root);
-    }
+      if (!fs.delete(root, true)) {
+        throw new IOException("Failed to delete root test dir: " + root);
+      }
+      if (!fs.mkdirs(root)) {
+        throw new IOException("Failed to create root test dir: " + root);
+      }
     }
+    EnvironmentEdgeManagerTestHelper.reset();
   }
 
   private static final Log LOG = LogFactory.getLog(TestSnapshotDescriptionUtils.class);