HDFS-13681. Fix TestStartup.testNNFailToStartOnReadOnlyNNDir test fai…

…lure on Windows. Contributed by Xiao Liang. (cherry picked from commit 8762e9c)
justinuang · Jun 15, 2018 · f7a8717 · f7a8717
1 parent 0c1c26a
commit f7a8717
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartup.java b/...project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
@@ -689,8 +689,8 @@ public void testNNFailToStartOnReadOnlyNNDir() throws Exception {
       assertTrue(nnDirs.iterator().hasNext());
       assertEquals(
           "NN dir should be created after NN startup.",
-          nnDirStr,
-          nnDirs.iterator().next().getPath());
+          new File(nnDirStr),
+          new File(nnDirs.iterator().next().getPath()));
       final File nnDir = new File(nnDirStr);
       assertTrue(nnDir.exists());
       assertTrue(nnDir.isDirectory());
@@ -699,7 +699,7 @@ public void testNNFailToStartOnReadOnlyNNDir() throws Exception {
         /* set read only */
         assertTrue(
             "Setting NN dir read only should succeed.",
-            nnDir.setReadOnly());
+            FileUtil.setWritable(nnDir, false));
         cluster.restartNameNodes();
         fail("Restarting NN should fail on read only NN dir.");
       } catch (InconsistentFSStateException e) {
@@ -711,7 +711,8 @@ public void testNNFailToStartOnReadOnlyNNDir() throws Exception {
                 "storage directory does not exist or is not accessible."))));
       } finally {
         /* set back to writable in order to clean it */
-        assertTrue("Setting NN dir should succeed.", nnDir.setWritable(true));
+        assertTrue("Setting NN dir should succeed.",
+            FileUtil.setWritable(nnDir, true));
       }
     }
   }