From 8b427fcc8998c8233c33a03d00a6d09d2883f085 Mon Sep 17 00:00:00 2001
From: Sneha Vijayarajan <sneha.vijayarajan@gmail.com>
Date: Thu, 26 Nov 2020 01:41:09 +0530
Subject: [PATCH] Rename contract test update fix

---
 .../azurebfs/contract/ITestAbfsFileSystemContractRename.java | 5 +++++
 hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractRename.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractRename.java
index b92bef68a0908..cd60e6d5ae498 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractRename.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractRename.java
@@ -38,6 +38,11 @@ public ITestAbfsFileSystemContractRename() throws Exception {
   public void setup() throws Exception {
     binding.setup();
     super.setup();
+    // Base rename contract test class re-uses the test folder
+    // This leads to failures when the test is re-run as same ABFS test
+    // containers are re-used for test run and creation of source and
+    // destination test paths fail, as they are already present.
+    binding.getFileSystem().delete(binding.getTestPath(), true);
   }
 
   @Override
diff --git a/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml b/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml
index d43d67e7b5fa3..069b13e146d12 100644
--- a/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml
+++ b/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml
@@ -38,6 +38,11 @@
     <value>false</value>
   </property>
 
+  <property>
+    <name>fs.contract.rename-returns-false-if-dest-exists</name>
+    <value>true</value>
+  </property>
+
   <!--====================  ABFS CONFIGURATION ====================-->
   <!-- SEE relevant section in "site/markdown/testing_azure.md"-->