fix tests

Author: anmolanmol1234

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsBlobClient.java

@@ -587,16 +587,19 @@ public AbfsRestOperation conditionalCreateOverwriteFile(String relativePath,
       boolean isAppendBlob,
       ContextEncryptionAdapter contextEncryptionAdapter,
       TracingContext tracingContext) throws IOException {
-    // Check for non-empty directory at the path. The only pending validation is the check for an explicitly empty directory,
-    // which is performed later to optimize TPS by delaying the lookup only if create with overwrite=false fails.
-    if (isNonEmptyDirectory(relativePath, tracingContext)) {
-      throw new AbfsRestOperationException(HTTP_CONFLICT,
-          AzureServiceErrorCode.PATH_CONFLICT.getErrorCode(),
-          PATH_EXISTS,
-          null);
+    if (!getIsNamespaceEnabled()) {
+      // Check for non-empty directory at the path. The only pending validation is the check for an explicitly empty directory,
+      // which is performed later to optimize TPS by delaying the lookup only if create with overwrite=false fails.
+      if (isNonEmptyDirectory(relativePath, tracingContext)) {
+        throw new AbfsRestOperationException(HTTP_CONFLICT,
+            AzureServiceErrorCode.PATH_CONFLICT.getErrorCode(),
+            PATH_EXISTS,
+            null);
+      }
+      // Create markers for the parent hierarchy.
+      tryMarkerCreation(relativePath, isAppendBlob, null,
+          contextEncryptionAdapter, tracingContext);
     }
-    // Create markers for the parent hierarchy.
-    tryMarkerCreation(relativePath, isAppendBlob, null, contextEncryptionAdapter, tracingContext);
     AbfsRestOperation op;
     try {
       // Trigger a creation with overwrite=false first so that eTag fetch can be

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemCreate.java

@@ -104,9 +104,6 @@ public class ITestAzureBlobFileSystemCreate extends
   private static final Path TEST_FILE_PATH = new Path("testfile");
   private static final String TEST_FOLDER_PATH = "testFolder";
   private static final String TEST_CHILD_FILE = "childFile";
-  private static final String PATH_CONFLICT
-      = "The specified path, or an element of the path, exists and its resource type is invalid for this operation.";
-  private  static final String BLOB_EXIST = "already exists";
 
   public ITestAzureBlobFileSystemCreate() throws Exception {
     super();
@@ -1008,7 +1005,6 @@ public void testCreationWithoutConditionalOverwrite()
                    config)) {
         fs.mkdirs(new Path("a/b/c"));
         intercept(IOException.class,
-            PATH_CONFLICT,
             () -> fs.create(new Path("a/b/c"), true));
       }
     }
@@ -1026,11 +1022,13 @@ public void testCreationWithoutConditionalOverwrite()
   public void testCreationOverwriteFalseWithoutConditionalOverwrite() throws Exception {
     try (AzureBlobFileSystem currentFs = getFileSystem()) {
       Configuration config = new Configuration(this.getRawConfiguration());
-      config.set("fs.azure.enable.conditional.create.overwrite", String.valueOf(false));
+      config.set("fs.azure.enable.conditional.create.overwrite",
+          String.valueOf(false));
 
-      try (AzureBlobFileSystem fs = (AzureBlobFileSystem) FileSystem.newInstance(currentFs.getUri(), config)) {
+      try (AzureBlobFileSystem fs = (AzureBlobFileSystem) FileSystem.newInstance(
+          currentFs.getUri(), config)) {
         fs.mkdirs(new Path("a/b/c"));
-        intercept(IOException.class, BLOB_EXIST,
+        intercept(IOException.class,
             () -> fs.create(new Path("a/b/c"), false));
       }
     }
@@ -1047,7 +1045,7 @@ public void testCreateSameFileWithOverwriteFalse() throws Exception {
       Assertions.assertThat(fs.exists(new Path("a/b/c")))
           .describedAs("Path does not exist")
           .isTrue();
-      intercept(IOException.class, BLOB_EXIST,
+      intercept(IOException.class,
           () -> fs.create(new Path("a/b/c"), false));
     }
   }
@@ -1064,7 +1062,6 @@ public void testCreateSubPath() throws Exception {
           .describedAs("Path does not exist")
           .isTrue();
       intercept(IOException.class,
-          PATH_CONFLICT,
           () -> fs.create(new Path("a/b")));
     }
   }
@@ -1222,9 +1219,9 @@ public void testParentExplicitPathImplicit() throws Exception {
       Path sourcePath = new Path(sourcePathName);
       createAzCopyFolder(sourcePath);
 
-      intercept(IOException.class, PATH_CONFLICT, () ->
+      intercept(IOException.class, () ->
           fs.create(sourcePath, true));
-      intercept(IOException.class, PATH_CONFLICT, () ->
+      intercept(IOException.class, () ->
           fs.create(sourcePath, false));
 
       Assertions.assertThat(
@@ -1374,7 +1371,7 @@ public void testCreateFileParentFile() throws Exception {
 
       String childName = "/testParentFile/testChildFile";
       Path child = new Path(childName);
-      IOException e = intercept(IOException.class, PATH_CONFLICT, () ->
+      IOException e = intercept(IOException.class, () ->
           fs.create(child, false));
 
       // asserting that parent stays explicit
@@ -1396,8 +1393,7 @@ public void testCreateMkdirs() throws Exception {
     try (AzureBlobFileSystem fs = getFileSystem()) {
       fs.create(new Path("a/b/c"));
       intercept(IOException.class,
-          "The specified path, or an element of the path, exists and its resource type is invalid for this operation.",
-          () -> fs.mkdirs(new Path("a/b/c/d")));
+            () -> fs.mkdirs(new Path("a/b/c/d")));
     }
   }
 
@@ -1554,7 +1550,7 @@ public void testFileCreateMkdirsRoot() throws Exception {
       fs.setWorkingDirectory(new Path("/"));
       final Path p1 = new Path("dir1");
       fs.create(p1);
-      intercept(IOException.class, PATH_CONFLICT,
+      intercept(IOException.class,
           () -> fs.mkdirs(new Path("dir1/dir2")));
     }
   }
@@ -1568,7 +1564,7 @@ public void testFileCreateMkdirsNonRoot() throws Exception {
     try (AzureBlobFileSystem fs = getFileSystem()) {
       final Path p1 = new Path("dir1");
       fs.create(p1);
-      intercept(IOException.class, PATH_CONFLICT, () -> fs.mkdirs(new Path("dir1/dir2")));
+      intercept(IOException.class, () -> fs.mkdirs(new Path("dir1/dir2")));
     }
   }
 
@@ -1753,7 +1749,8 @@ public void testCreateDirectoryAndFileRecreation() throws Exception {
       Assertions.assertThat(fs.exists(new Path("a/b/c/d")))
           .describedAs("File a/b/c/d does not exist")
           .isTrue();
-      intercept(IOException.class, PATH_CONFLICT, () -> fs.mkdirs(new Path("a/b/c/d")));
+        intercept(IOException.class,
+            () -> fs.mkdirs(new Path("a/b/c/d")));
     }
   }