Made easy to set or switch test account to use over script option

Author: snvijaya

hadoop-tools/hadoop-azure/dev-support/testrun-scripts/runtests.sh

@@ -34,31 +34,31 @@ processCount=8
 
 runHNSOAuthTest()
 {
-  accountName=$(xmlstarlet sel -t -v '//property[name = "fs.azure.hnsTestAccountName"]/value' $azureTestXmlPath)
+  accountName=$(xmlstarlet sel -t -v '//property[name = "fs.azure.hnsTestAccountName"]/value' -n $azureTestXmlPath)
   PROPERTIES=("fs.azure.account.auth.type")
   VALUES=("OAuth")
   triggerRun "HNS-OAuth" "$accountName" "$runTest" $processCount "$cleanUpTestContainers"
 }
 
 runHNSSharedKeyTest()
 {
-  accountName=$(xmlstarlet sel -t -v '//property[name = "fs.azure.hnsTestAccountName"]/value' $azureTestXmlPath)
+  accountName=$(xmlstarlet sel -t -v '//property[name = "fs.azure.hnsTestAccountName"]/value' -n $azureTestXmlPath)
   PROPERTIES=("fs.azure.account.auth.type")
   VALUES=("SharedKey")
   triggerRun "HNS-SharedKey" "$accountName"  "$runTest" $processCount "$cleanUpTestContainers"
 }
 
 runNonHNSSharedKeyTest()
 {
-  accountName=$(xmlstarlet sel -t -v '//property[name = "fs.azure.nonHnsTestAccountName"]/value' $azureTestXmlPath)
+  accountName=$(xmlstarlet sel -t -v '//property[name = "fs.azure.nonHnsTestAccountName"]/value' -n $azureTestXmlPath)
   PROPERTIES=("fs.azure.account.auth.type")
   VALUES=("SharedKey")
   triggerRun "NonHNS-SharedKey" "$accountName" "$runTest" $processCount "$cleanUpTestContainers"
 }
 
 runAppendBlobHNSOAuthTest()
 {
-  accountName=$(xmlstarlet sel -t -v '//property[name = "fs.azure.hnsTestAccountName"]/value' $azureTestXmlPath)
+  accountName=$(xmlstarlet sel -t -v '//property[name = "fs.azure.hnsTestAccountName"]/value' -n $azureTestXmlPath)
   PROPERTIES=("fs.azure.account.auth.type" "fs.azure.test.appendblob.enabled")
   VALUES=("OAuth" "true")
   triggerRun "AppendBlob-HNS-OAuth" "$accountName" "$runTest" $processCount "$cleanUpTestContainers"
@@ -130,7 +130,7 @@ done
 
 echo ' '
 echo 'Set the active test combination to run the action:'
-select combo in HNS-OAuth HNS-SharedKey nonHNS-SharedKey AppendBlob-HNS-OAuth All Quit
+select combo in HNS-OAuth HNS-SharedKey nonHNS-SharedKey AppendBlob-HNS-OAuth AllCombinationsTestRun Quit
 do
    case $combo in
       HNS-OAuth)
@@ -149,10 +149,10 @@ do
          runAppendBlobHNSOAuthTest
          break
          ;;
-      All)
+      AllCombinationsTestRun)
         if [ $runTest == false ]
         then
-          logOutput "ERROR: Invalid selection for SET_ACTIVE_TEST_CONFIG. This is applicable only for test runs."
+          logOutput "ERROR: Invalid selection for SET_ACTIVE_TEST_CONFIG. This is applicable only for RUN_TEST."
           break
         fi
          runHNSOAuthTest

hadoop-tools/hadoop-azure/dev-support/testrun-scripts/testsupport.sh

@@ -41,6 +41,11 @@ triggerRun()
   runTest=$3
   processcount=$4
   cleanUpTestContainers=$5
+
+  if [ -z "$accountName" ]; then
+    logOutput "ERROR: Test account not configured. Re-run the script and choose SET_OR_CHANGE_TEST_ACCOUNT to configure the test account."
+    exit 0;
+  fi
   accountConfigFile=$accountSettingsFolderName/$accountName$accountConfigFileSuffix
   rm -rf $combtestfile
   cat > $combtestfile << ENDOFFILE
@@ -83,8 +88,7 @@ ENDOFFILE
   if [ "$cleanUpTestContainers" == true ]
   then
     mvn test -Dtest=org.apache.hadoop.fs.azurebfs.utils.CleanupTestContainers >> "$testlogfilename" || true
-    if
-    grep -c "There are test failures" $testlogfilename > 0
+    if grep -q "There are test failures" "$testlogfilename";
     then logOutput "ERROR: All test containers could not be deleted. Detailed error cause in $testlogfilename"
     pcregrep -M "$testresultsregex" "$testlogfilename"
     exit 0
@@ -164,5 +168,5 @@ init() {
  }
 
 logOutput() {
-  echo -e $outputFormatOn $1 $outputFormatOff
+  echo -e "$outputFormatOn" "$1" "$outputFormatOff"
 }

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

@@ -50,7 +50,6 @@
 import static org.apache.hadoop.fs.azurebfs.constants.TestConfigurationKeys.FS_AZURE_BLOB_FS_CLIENT_ID;
 import static org.apache.hadoop.fs.azurebfs.constants.TestConfigurationKeys.FS_AZURE_BLOB_FS_CLIENT_SECRET;
 import static org.apache.hadoop.fs.azurebfs.constants.TestConfigurationKeys.FS_AZURE_TEST_NAMESPACE_ENABLED_ACCOUNT;
-import static org.apache.hadoop.test.LambdaTestUtils.intercept;
 
 /**
  * Test cases for AzureBlobFileSystem.access()