Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-14247. FileContextMainOperationsBaseTest should clean up test root path. Contributed by Mingliang Liu 

(cherry picked from commit 13c766b62c)
This commit is contained in:
Mingliang Liu 2017-03-27 16:37:39 -07:00
parent e00ad6fca5
commit 3d5e9e61d5
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
View File

@ -36,6 +36,8 @@ import org.junit.Assert;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.hadoop.fs.FileContextTestHelper.*; import static org.apache.hadoop.fs.FileContextTestHelper.*;
import static org.apache.hadoop.fs.CreateFlag.*; import static org.apache.hadoop.fs.CreateFlag.*;
@ -60,6 +62,9 @@ import static org.apache.hadoop.fs.CreateFlag.*;
* </p> * </p>
*/ */
public abstract class FileContextMainOperationsBaseTest { public abstract class FileContextMainOperationsBaseTest {
protected static final Logger LOG =
LoggerFactory.getLogger(FileContextMainOperationsBaseTest.class);
private static String TEST_DIR_AAA2 = "test/hadoop2/aaa"; private static String TEST_DIR_AAA2 = "test/hadoop2/aaa";
private static String TEST_DIR_AAA = "test/hadoop/aaa"; private static String TEST_DIR_AAA = "test/hadoop/aaa";
@ -111,9 +116,19 @@ public abstract class FileContextMainOperationsBaseTest {
@After @After
public void tearDown() throws Exception { public void tearDown() throws Exception {
if (fc != null) { if (fc != null) {
boolean del = fc.delete(new Path(fileContextTestHelper.getAbsoluteTestRootPath(fc), new Path("test")), true); final Path testRoot = fileContextTestHelper.getAbsoluteTestRootPath(fc);
assertTrue(del); LOG.info("Deleting test root path {}", testRoot);
fc.delete(localFsRootPath, true); try {
fc.delete(testRoot, true);
} catch (Exception e) {
LOG.error("Error when deleting test root path " + testRoot, e);
}
try {
fc.delete(localFsRootPath, true);
} catch (Exception e) {
LOG.error("Error when deleting localFsRootPath " + localFsRootPath, e);
}
} }
} }