Fixed OperationalInsights tests.

Author: Hovsep Mkrtchyan

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs

@@ -58,8 +58,10 @@ public EnvironmentSetupHelper()
             rmprofile.Environments.Add("foo", AzureEnvironment.PublicEnvironments.Values.FirstOrDefault());
             rmprofile.Context = new AzureContext(new AzureSubscription(), new AzureAccount(), rmprofile.Environments["foo"], new AzureTenant());
             rmprofile.Context.Subscription.Environment = "foo";
-            AzureRMCmdlet.DefaultProfile = rmprofile;
-            AzureSession.DataStore = datastore;
+            if (AzureRMCmdlet.DefaultProfile == null)
+            {
+                AzureRMCmdlet.DefaultProfile = rmprofile;
+            }
             ProfileClient = new ProfileClient(profile);
 
             // Ignore SSL errors
@@ -168,6 +170,11 @@ private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
                 ProfileClient.AddOrSetEnvironment(environment);
             }
 
+            if (!AzureRMCmdlet.DefaultProfile.Environments.ContainsKey(testEnvironmentName))
+            {
+                AzureRMCmdlet.DefaultProfile.Environments[testEnvironmentName] = environment;
+            }
+
             if (currentEnvironment.SubscriptionId != null)
             {
                 testSubscription = new AzureSubscription()
@@ -199,6 +206,17 @@ private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
                 ProfileClient.Profile.Subscriptions[testSubscription.Id] = testSubscription;
                 ProfileClient.Profile.Accounts[testAccount.Id] = testAccount;
                 ProfileClient.SetSubscriptionAsDefault(testSubscription.Name, testSubscription.Account);
+
+                var testTenant = new AzureTenant() { Id = Guid.NewGuid() };
+                if (!string.IsNullOrEmpty(currentEnvironment.Tenant))
+                {
+                    Guid tenant;
+                    if (Guid.TryParse(currentEnvironment.Tenant, out tenant))
+                    {
+                        testTenant.Id = tenant;
+                    }
+                }
+                AzureRMCmdlet.DefaultProfile.Context = new AzureContext(testSubscription, testAccount, environment, testTenant);
             }
         }
 

src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/Common.ps1

@@ -36,7 +36,7 @@ Gets a valid storage account resource id
 #>
 function Get-StorageResourceId($rgname, $resourcename)
 {
-    $subscription = (Get-AzureRmSubscription -Default).SubscriptionId
+    $subscription = (Get-AzureRmContext).Subscription.SubscriptionId
     return "/subscriptions/$subscription/resourcegroups/$rgname/providers/microsoft.storage/storageaccounts/$resourcename"
 }
 

src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/OperationalInsightsScenarioTestBase.cs

@@ -19,8 +19,10 @@
 using Microsoft.Azure.Management.Resources;
 using Microsoft.Azure.Subscriptions;
 using Microsoft.Azure.Test;
+using Microsoft.Azure.Test.HttpRecorder;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
+using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.OperationalInsights.Test
 {
@@ -51,6 +53,10 @@ protected void SetupManagementClients()
 
         protected void RunPowerShellTest(params string[] scripts)
         {
+            Dictionary<string, string> d = new Dictionary<string, string>();
+            d.Add("Microsoft.Authorization", null);
+            HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(false, d);
+
             using (UndoContext context = UndoContext.Current)
             {
                 context.Start(TestUtilities.GetCallingClass(2), TestUtilities.GetCurrentMethodName(2));

src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/StorageInsightTests.cs

@@ -19,14 +19,14 @@ namespace Microsoft.Azure.Commands.OperationalInsights.Test
 {
     public class StorageInsightTests : OperationalInsightsScenarioTestBase
     {
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestStorageInsightCreateUpdateDelete()
         {
             RunPowerShellTest("Test-StorageInsightCreateUpdateDelete");
         }
 
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestStorageInsightCreateFailsWithoutWorkspace()
         {