From 527fb0d5d4f39289795d287ac6d22e08173415a2 Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Thu, 8 Oct 2015 20:27:59 -0700 Subject: [PATCH 1/2] Fix ASM Compute test setup. --- .../FunctionalTests/ServiceManagementTest.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs index c0d4e43ced9b..9dbe5e1a4426 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs @@ -105,9 +105,9 @@ public static void SetDefaultStorage() { defaultAzureSubscription = vmPowershellCmdlets.SetAzureSubscription(defaultAzureSubscription.SubscriptionName, defaultAzureSubscription.SubscriptionId, CredentialHelper.DefaultStorageName); vmPowershellCmdlets.SelectAzureSubscription(defaultAzureSubscription.SubscriptionName, true); - storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccountName); - Assert.AreEqual(defaultAzureSubscription.CurrentStorageAccountName, storageAccountKey.StorageAccountName); - blobUrlRoot = (vmPowershellCmdlets.GetAzureStorageAccount(defaultAzureSubscription.CurrentStorageAccountName)[0].Endpoints.ToArray())[0]; + storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(CredentialHelper.DefaultStorageName); + Assert.AreEqual(CredentialHelper.DefaultStorageName, storageAccountKey.StorageAccountName); + blobUrlRoot = (vmPowershellCmdlets.GetAzureStorageAccount(CredentialHelper.DefaultStorageName)[0].Endpoints.ToArray())[0]; } else { From 75ae80ddc950c0f337379178c241b232f6bf1bc5 Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Thu, 8 Oct 2015 20:28:36 -0700 Subject: [PATCH 2/2] Add location parameter to virtual machine test --- .../ScenarioTests/VirtualMachineTests.cs | 2 +- .../ScenarioTests/VirtualMachineTests.ps1 | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.cs b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.cs index 7343e9362214..6420b7540024 100644 --- a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.cs +++ b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.cs @@ -23,7 +23,7 @@ public partial class VirtualMachineTests [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestVirtualMachine() { - ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachine"); + ComputeTestController.NewInstance.RunPsTest(@"Test-VirtualMachine $null"); } [Fact] diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1 index 9069564869fd..cb42244dd881 100644 --- a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1 +++ b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1 @@ -18,13 +18,17 @@ Test Virtual Machines #> function Test-VirtualMachine { + param ($loc) # Setup $rgname = Get-ComputeTestResourceName try { # Common - $loc = Get-ComputeVMLocation; + if ($loc -eq $null) + { + $loc = Get-ComputeVMLocation; + } New-AzureRmResourceGroup -Name $rgname -Location $loc -Force; # VM Profile & Hardware