Author: stack
Date: Sat Sep 17 15:50:59 2011
New Revision: 1172005
URL: http://svn.apache.org/viewvc?rev=1172005&view=rev
Log:
HBASE-4423 HBASE-4238 broke TestCatalogJanitor#testCleanParent test; Actually
apply this -- I only applied CHANGES.txt yesterday
Modified:
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
Modified:
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java?rev=1172005&r1=1172004&r2=1172005&view=diff
==============================================================================
---
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
(original)
+++
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
Sat Sep 17 15:50:59 2011
@@ -218,14 +218,6 @@ public class TestCatalogJanitor {
assertFalse(janitor.cleanParent(parent, r));
// Remove the reference file and try again.
assertTrue(fs.delete(p, true));
- // We will fail!!! Because split b is empty, which is right... we should
- // not remove parent if daughters do not exist in fs.
- assertFalse(janitor.cleanParent(parent, r));
- // Put in place daughter dir for b... that should make it so parent gets
- // cleaned up.
- storedir = Store.getStoreHomedir(tabledir, splitb.getEncodedName(),
- htd.getColumnFamilies()[0].getName());
- assertTrue(fs.mkdirs(storedir));
assertTrue(janitor.cleanParent(parent, r));
}
-}
\ No newline at end of file
+}