Merge pull request #2509 from adarce/feature/fix-RunKeyVaultTests

Fix issues with running RunKeyVaultTests.ps1.

Author: markcowl

src/Common/Commands.ScenarioTests.Common/Common.ps1

@@ -201,8 +201,6 @@
     <None Include="Scripts\proddata\byoktest1024.byok" />
     <None Include="Scripts\proddata\pfxtest.pfx" />
     <None Include="Scripts\proddata\pfxtest1024.pfx" />
-    <None Include="Scripts\PSHCommon\Assert.ps1" />
-    <None Include="Scripts\PSHCommon\Common.ps1" />
     <None Include="Scripts\RunKeyVaultTests.ps1" />
     <None Include="Scripts\RunUITests.ps1" />
     <None Include="Scripts\VaultKeyTests.ps1" />

src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj

@@ -109,11 +109,15 @@ function Get-ImportKeyFile1024([string]$filesuffix, [bool] $exists=$true)
 
 <#
 .SYNOPSIS
-Remove log file under a folder
+Remove log files under the given folder.
 #>
-function Cleanup-Log([string]$rootfolder)
-{    
-    Get-ChildItem –Path $rootfolder -Include *.debug_log -Recurse | where {$_.mode -match "a"} | Remove-Item -Force     
+function Cleanup-LogFiles([string]$rootfolder)
+{
+    Write-Host "Cleaning up log files from $rootfolder..."
+    
+    Get-ChildItem –Path $rootfolder -Include *.debug_log -Recurse |
+        where {$_.mode -match "a"} |
+        Remove-Item -Force     
 }
 
 <#
@@ -125,7 +129,7 @@ function Move-Log([string]$rootfolder)
     $logfolder = Join-Path $rootfolder ("$global:testEnv"+"$global:testns"+"log")
     if (Test-Path $logfolder)
     {
-        Cleanup-Log $logfolder
+        Cleanup-LogFiles $logfolder
     }
     else
     {
@@ -138,24 +142,32 @@ function Move-Log([string]$rootfolder)
 
 <#
 .SYNOPSIS
-Removes all keys starting with the prefix
+Remove all old keys starting with the given prefix.
 #>
-function Initialize-KeyTest
+function Cleanup-OldKeys
 {
+    Write-Host "Cleaning up old keys..."
+
     $keyVault = Get-KeyVault
     $keyPattern = Get-KeyName '*'
-    Get-AzureKeyVaultKey $keyVault  | Where-Object {$_.KeyName -like $keyPattern}  | Remove-AzureKeyVaultKey -Force -Confirm:$false
+    Get-AzureKeyVaultKey $keyVault |
+        Where-Object {$_.KeyName -like $keyPattern} |
+        Remove-AzureKeyVaultKey -Force -Confirm:$false
 }
 
 <#
 .SYNOPSIS
-Removes all secrets starting with the prefix
+Remove all old secrets starting with the given prefix.
 #>
-function Initialize-SecretTest
+function Cleanup-OldSecrets
 {
+    Write-Host "Cleaning up old secrets..."
+
     $keyVault = Get-KeyVault
     $secretPattern = Get-SecretName '*'
-    Get-AzureKeyVaultSecret $keyVault  | Where-Object {$_.SecretName -like $secretPattern}  | Remove-AzureKeyVaultSecret -Force -Confirm:$false
+    Get-AzureKeyVaultSecret $keyVault |
+        Where-Object {$_.SecretName -like $secretPattern} |
+        Remove-AzureKeyVaultSecret -Force -Confirm:$false
 }