Merge branch 'release-1.0.0-preview' of https://github.com/AzureRT/azure-powershell into release-1.0.0-preview

hyonholee · hyonholee · commit 35c446917099 · 2015-10-09T00:29:18.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
@@ -106,9 +106,9 @@ public static void SetDefaultStorage()
                 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);
-                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
             {

Original file line number	Diff line number	Diff line change
`@@ -106,9 +106,9 @@ public static void SetDefaultStorage()`
`106`	`106`	`defaultAzureSubscription = vmPowershellCmdlets.SetAzureSubscription(defaultAzureSubscription.SubscriptionName, defaultAzureSubscription.SubscriptionId, CredentialHelper.DefaultStorageName);`
`107`	`107`	`defaultAzureSubscription.CurrentStorageAccountName = CredentialHelper.DefaultStorageName;`
`108`	`108`	`vmPowershellCmdlets.SelectAzureSubscription(defaultAzureSubscription.SubscriptionName, true);`
`109`		`- storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccountName);`
`110`		`- Assert.AreEqual(defaultAzureSubscription.CurrentStorageAccountName, storageAccountKey.StorageAccountName);`
`111`		`- blobUrlRoot = (vmPowershellCmdlets.GetAzureStorageAccount(defaultAzureSubscription.CurrentStorageAccountName)[0].Endpoints.ToArray())[0];`
	`109`	`+ storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(CredentialHelper.DefaultStorageName);`
	`110`	`+ Assert.AreEqual(CredentialHelper.DefaultStorageName, storageAccountKey.StorageAccountName);`
	`111`	`+ blobUrlRoot = (vmPowershellCmdlets.GetAzureStorageAccount(CredentialHelper.DefaultStorageName)[0].Endpoints.ToArray())[0];`
`112`	`112`	`}`
`113`	`113`	`else`
`114`	`114`	`{`