HDFS-11625. Ozone: Fix UT failures that caused by hard coded datanode data dirs. Contributed by Weiwei Yang.

This commit is contained in:
Anu Engineer 2017-04-05 10:11:44 -07:00 committed by Owen O'Malley
parent 7573a0bc61
commit cd361fa490
2 changed files with 5 additions and 4 deletions

View File

@ -62,9 +62,11 @@ public class TestCBlockCLI {
@AfterClass
public static void clean() {
cBlockManager.stop();
cBlockManager.join();
cBlockManager.clean();
if (cBlockManager != null) {
cBlockManager.stop();
cBlockManager.join();
cBlockManager.clean();
}
}
@After

View File

@ -303,7 +303,6 @@ public class TestDatanodeStateMachine {
for (String name : new String[] {
"", // Empty
"x..y", // Invalid schema
"scm:", // Missing port
"scm:xyz", // Invalid port
"scm:123456" // Port out of range
}) {