HDFS-13556. TestNestedEncryptionZones does not shut down cluster. Contributed by Anbang Hu.

This commit is contained in:
Inigo Goiri 2018-05-17 16:53:23 -07:00
parent 7c485a6701
commit a97a2042f2

View File

@ -35,6 +35,7 @@
import org.apache.hadoop.util.ToolRunner; import org.apache.hadoop.util.ToolRunner;
import org.apache.log4j.Level; import org.apache.log4j.Level;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -111,6 +112,14 @@ public void setup() throws Exception {
DFSTestUtil.createKey(NESTED_EZ_KEY, cluster, conf); DFSTestUtil.createKey(NESTED_EZ_KEY, cluster, conf);
} }
@After
public void tearDown() throws Exception {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}
@Test(timeout = 60000) @Test(timeout = 60000)
public void testNestedEncryptionZones() throws Exception { public void testNestedEncryptionZones() throws Exception {
initTopEZDirAndNestedEZDir(new Path(rootDir, "topEZ")); initTopEZDirAndNestedEZDir(new Path(rootDir, "topEZ"));