From d966df68e90aa772d3a19e5349fae721ed0a21f0 Mon Sep 17 00:00:00 2001
From: Karl Augsten <karlaug@microsoft.com>
Date: Tue, 30 Jun 2015 09:29:00 -0700
Subject: [PATCH 1/2] Add optional vault parameter to keyvault test scripts.

Add ability to specify which vault to test against.
---
 .../KeyVault/Commands.KeyVault.Test/Scripts/Common.ps1      | 6 +++++-
 .../Commands.KeyVault.Test/Scripts/RunKeyVaultTests.ps1     | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/Common.ps1 b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/Common.ps1
index c68ee77b0029..24c4583cf167 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/Common.ps1
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/Common.ps1
@@ -23,7 +23,11 @@ Get test key name
 #>
 function Get-KeyVault([bool] $haspermission=$true)
 {
-    if ($global:testEnv -eq 'BVT' -and $haspermission)
+    if ($global:testVault -ne "" -and $haspermission)
+    {
+        return $global:testVault
+    }
+    elseif ($global:testEnv -eq 'BVT' -and $haspermission)
     {        
         return 'powershellbvt'
     }
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/RunKeyVaultTests.ps1 b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/RunKeyVaultTests.ps1
index 5d3aaa284d66..3aa56b41ae02 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/RunKeyVaultTests.ps1
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/RunKeyVaultTests.ps1
@@ -8,7 +8,9 @@
   [ValidateSet('BVT','PROD')]
   [string]$TestEnvironment = 'PROD',    
   [Parameter(Mandatory=$false,Position=2, ParameterSetName="CPTests")]   
-  [string]$Location = 'eastus2'
+  [string]$Location = 'eastus2',
+  [Parameter(Mandatory=$false, Position=3)]
+  [string]$Vault = ""
 )
 
 $invocationPath = Split-Path $MyInvocation.MyCommand.Definition;
@@ -29,6 +31,7 @@ $global:times = @{}
 $global:testEnv = $TestEnvironment.ToUpperInvariant()
 $global:testns = $TestRunNameSpace
 $global:location = $location
+$global:testVault = $Vault
 
 function Run-TestProtected
 {

From da8fb23fd763cde8dce8be1d1daf6d5bdafcf17c Mon Sep 17 00:00:00 2001
From: Karl Augsten <karlaug@microsoft.com>
Date: Tue, 30 Jun 2015 10:59:58 -0700
Subject: [PATCH 2/2] Remove test environment parameter.

Test would not run with both ControlPlane and Dataplane tests
Removing test env param and setting to PROD always.
---
 .../Commands.KeyVault.Test/Scripts/RunKeyVaultTests.ps1    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/RunKeyVaultTests.ps1 b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/RunKeyVaultTests.ps1
index 3aa56b41ae02..29b9a529f80d 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/RunKeyVaultTests.ps1
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/RunKeyVaultTests.ps1
@@ -4,10 +4,7 @@
   [Parameter(Mandatory=$false,Position=1)]   
   [ValidateSet('ControlPlane','DataPlane', 'All')]
   [string]$TestMode = 'All',  
-  [Parameter(Mandatory=$false,Position=2, ParameterSetName="DPTests")]   
-  [ValidateSet('BVT','PROD')]
-  [string]$TestEnvironment = 'PROD',    
-  [Parameter(Mandatory=$false,Position=2, ParameterSetName="CPTests")]   
+  [Parameter(Mandatory=$false,Position=2)]   
   [string]$Location = 'eastus2',
   [Parameter(Mandatory=$false, Position=3)]
   [string]$Vault = ""
@@ -28,7 +25,7 @@ $global:passedCount = 0;
 $global:passedTests = @()
 $global:failedTests = @()
 $global:times = @{}
-$global:testEnv = $TestEnvironment.ToUpperInvariant()
+$global:testEnv = 'PROD';
 $global:testns = $TestRunNameSpace
 $global:location = $location
 $global:testVault = $Vault