From 52b3191e5279f3230ca2b25bafcb5d894e23ae3b Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Fri, 9 Oct 2015 00:14:36 -0700 Subject: [PATCH 1/2] Fix ASM AzureRT 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 446e8320b7be4843fb8de45fbbe8f859f5eed4b5 Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Fri, 9 Oct 2015 00:28:53 -0700 Subject: [PATCH 2/2] Fix ASM AzureRT test setup --- .../FunctionalTests/ServiceManagementTest.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs index c0d4e43ced9b..22ddd1439ea6 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs @@ -104,6 +104,7 @@ public static void SetDefaultStorage() if (!string.IsNullOrEmpty(GetDefaultStorage(CredentialHelper.DefaultStorageName, CredentialHelper.Location))) { defaultAzureSubscription = vmPowershellCmdlets.SetAzureSubscription(defaultAzureSubscription.SubscriptionName, defaultAzureSubscription.SubscriptionId, CredentialHelper.DefaultStorageName); + defaultAzureSubscription.CurrentStorageAccountName = CredentialHelper.DefaultStorageName; vmPowershellCmdlets.SelectAzureSubscription(defaultAzureSubscription.SubscriptionName, true); storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccountName); Assert.AreEqual(defaultAzureSubscription.CurrentStorageAccountName, storageAccountKey.StorageAccountName);