Merge branch 'release-2019-10-15' into jyanand-fix-tests

Author: msJinLei

src/DataLakeStore/DataLakeStore.Test/ScenarioTests/AdlsAliasTests.ps1

@@ -1012,7 +1012,7 @@ function Test-AdlsEnumerateAndRestoreDeletedItem
 	{
 		# Creating Account
 		$resourceGroupName = Get-ResourceGroupName
-		$accountName = Get-DataLakeStoreAccountName
+		$accountName = Get-DataLakeStoreAccountName + "-c12" # testing accountname validation
 		New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
 		$accountCreated = New-AdlStore -ResourceGroupName $resourceGroupName -Name $accountName -Location $location
 		Assert-AreEqual $accountName $accountCreated.Name

src/DataLakeStore/DataLakeStore.Test/ScenarioTests/AdlsTests.ps1

@@ -1012,7 +1012,7 @@ function Test-EnumerateAndRestoreDataLakeStoreDeletedItem
 	{
 		# Creating Account
 		$resourceGroupName = Get-ResourceGroupName
-		$accountName = Get-DataLakeStoreAccountName
+		$accountName = Get-DataLakeStoreAccountName + "-c12" # testing accountname validation
 		New-AzResourceGroup -Name $resourceGroupName -Location $location
 		$accountCreated = New-AzDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $accountName -Location $location
 

src/DataLakeStore/DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestAdlsEnumerateAndRestoreDeletedItem.json

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fix account validation so that accounts with "-" can be passed without domain
 
 ## Version 1.2.2
 * Fix hanging of Get-DataLakeStoreDeletedItem for any errors or remote exceptions.

src/DataLakeStore/DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestAdlsFileSystem.json

@@ -23,7 +23,7 @@ public class AdlsClientFactory
         internal static ServiceClientCredentials MockCredentials = null;
         private static string HandleAccntName(string accnt,IAzureContext context)
         {
-            if (Regex.IsMatch(accnt, @"^[a-zA-Z0-9]+$"))
+            if (Regex.IsMatch(accnt, @"^[a-zA-Z0-9\-]+$"))
             {
                 string domain = context.Environment.GetEndpoint(AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix);
                 if (domain.EndsWith("/"))