Merge branch 'vmss' of https://github.com/huangpf/azure-powershell into vmss

huangpf · huangpf · commit 38d4ba512e71 · 2015-10-16T17:38:00.000-07:00
diff --git 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(CredentialHelper.DefaultStorageName);
                 Assert.AreEqual(CredentialHelper.DefaultStorageName, storageAccountKey.StorageAccountName);

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,7 @@ public static void SetDefaultStorage()`
`104`	`104`	`if (!string.IsNullOrEmpty(GetDefaultStorage(CredentialHelper.DefaultStorageName, CredentialHelper.Location)))`
`105`	`105`	`{`
`106`	`106`	`defaultAzureSubscription = vmPowershellCmdlets.SetAzureSubscription(defaultAzureSubscription.SubscriptionName, defaultAzureSubscription.SubscriptionId, CredentialHelper.DefaultStorageName);`
	`107`	`+ defaultAzureSubscription.CurrentStorageAccountName = CredentialHelper.DefaultStorageName;`
`107`	`108`	`vmPowershellCmdlets.SelectAzureSubscription(defaultAzureSubscription.SubscriptionName, true);`
`108`	`109`	`storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(CredentialHelper.DefaultStorageName);`
`109`	`110`	`Assert.AreEqual(CredentialHelper.DefaultStorageName, storageAccountKey.StorageAccountName);`