HDFS-13556. TestNestedEncryptionZones does not shut down cluster. Contributed by Anbang Hu.
(cherry picked from commit a97a2042f2
)
This commit is contained in:
parent
8c463a2a9c
commit
f67865ed7e
|
@ -35,6 +35,7 @@ import org.apache.hadoop.security.UserGroupInformation;
|
||||||
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 class TestNestedEncryptionZones {
|
||||||
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"));
|
||||||
|
|
Loading…
Reference in New Issue