Merge pull request #2 from MiYanni/AzureAutomation-Tests

Az Testing Fix

Author: Francisco-Gamino

src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj

@@ -166,52 +166,52 @@
     <Content Include="SessionRecords\Commands.Automation.Test.HybridWorkerGroupTests\E2EHybridWorkerGroup.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\CreateLinuxWeeklySUC.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\CreateLinuxWeeklySUC.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\CreateWindowsMonthlySUC.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\CreateWindowsMonthlySUC.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\CreateLinuxOneTimeSUCNonAzureOnly.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\CreateLinuxOneTimeSUCNonAzureOnly.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\CreateLinuxOneTimeSUCWithAllOption.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\CreateLinuxOneTimeSUCWithAllOption.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\CreateLinuxOneTimeSUCWithDefaults.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\CreateLinuxOneTimeSUCWithDefaults.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\CreateWindowsOneTimeSUCWithAllOption.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\CreateWindowsOneTimeSUCWithAllOption.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\CreateWindowsOneTimeSUCWithDefaults.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\CreateWindowsOneTimeSUCWithDefaults.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\DeleteSUC.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\DeleteSUC.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\GetAllMachineRuns.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\GetAllMachineRuns.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\GetAllMachineRunsWithFilters.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\GetAllMachineRunsWithFilters.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\GetAllMachineRunsWithFiltersNoResults.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\GetAllMachineRunsWithFiltersNoResults.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\GetAllRuns.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\GetAllRuns.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\GetAllRunsWithFilters.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\GetAllRunsWithFilters.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\GetAllRunsWithFiltersNoResults.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\GetAllRunsWithFiltersNoResults.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\GetAllSUCs.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\GetAllSUCs.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\GetAllSUCsForVM.json">
+    <Content Include="SessionRecords\Commands.Automation.Test.UpdateManagementTests\GetAllSUCsForVM.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

src/ResourceManager/Automation/Commands.Automation.Test/ScenarioTests/AutomationScenarioTestsBase.cs

@@ -51,15 +51,12 @@ protected void RunPowerShellTest(XunitTracingInterceptor logger, params string[]
             {
                 SetupManagementClients(context);
 
-                _helper.SetupEnvironment(AzureModule.AzureResourceManager);
-
                 var callingClassName = callingClassType?
                     .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)
                     .Last();
 
                 var scriptLocation = Path.Combine("ScenarioTests", callingClassName + ".ps1");
                 _helper.SetupModules(
-                    AzureModule.AzureResourceManager,
                     scriptLocation,
                     _helper.RMProfileModule,
                     _helper.GetRMModulePath(@"AzureRM.Automation.psd1"));

src/ResourceManager/Automation/Commands.Automation.Test/ScenarioTests/UpdateManagementTests.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement
+namespace Commands.Automation.Test
 {
     using Microsoft.Azure.Commands.Automation.Test;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;

src/ResourceManager/Automation/Commands.Automation.Test/SessionRecords/Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests/CreateLinuxOneTimeSUCNonAzureOnly.json renamed to src/ResourceManager/Automation/Commands.Automation.Test/SessionRecords/Commands.Automation.Test.UpdateManagementTests/CreateLinuxOneTimeSUCNonAzureOnly.json

@@ -51,7 +51,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Profile'; ModuleVersion = '0.4.0'; })
+RequiredModules = @(@{ModuleName = 'Az.Profile'; ModuleVersion = '0.2.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Automation.dll', '.\Microsoft.Azure.Management.ResourceManager.dll'

src/ResourceManager/Automation/Commands.Automation.Test/SessionRecords/Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests/CreateLinuxOneTimeSUCWithAllOption.json renamed to src/ResourceManager/Automation/Commands.Automation.Test/SessionRecords/Commands.Automation.Test.UpdateManagementTests/CreateLinuxOneTimeSUCWithAllOption.json

@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.Automation.Cmdlet.UpdateManagement
     /// <summary>
     /// Removes a Certificate for automation.
     /// </summary>
-    [Cmdlet(VerbsCommon.Remove, "AzureRmAutomationSoftwareUpdateConfiguration", SupportsShouldProcess = true,
+    [Cmdlet(VerbsCommon.Remove, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "AutomationSoftwareUpdateConfiguration", SupportsShouldProcess = true,
         DefaultParameterSetName = AutomationCmdletParameterSets.BySucName)]
     [OutputType(typeof(void), typeof(bool))]
     public class RemoveAzureAutomationSoftwareUpdateConfiguration : AzureAutomationBaseCmdlet

src/ResourceManager/Automation/Commands.Automation.Test/SessionRecords/Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests/CreateLinuxOneTimeSUCWithDefaults.json renamed to src/ResourceManager/Automation/Commands.Automation.Test/SessionRecords/Commands.Automation.Test.UpdateManagementTests/CreateLinuxOneTimeSUCWithDefaults.json

@@ -816,7 +816,7 @@ public void RegisterDscNode(string resourceGroupName,
                                             agentRegistrationInfo.PrimaryKey);
 
             var armClient = AzureSession.Instance.ClientFactory.CreateArmClient<ResourceManagementClient>(azureContext, AzureEnvironment.Endpoint.ResourceManager);
-                
+
             var deployment = new Management.ResourceManager.Models.Deployment
             {
                 Properties = new Management.ResourceManager.Models.DeploymentProperties
@@ -826,8 +826,8 @@ public void RegisterDscNode(string resourceGroupName,
                 }
             };
 
-            armClient.Deployments.CreateOrUpdate(azureVmResourceGroup, Guid.NewGuid().ToString(), deployment);               
-            
+            armClient.Deployments.CreateOrUpdate(azureVmResourceGroup, Guid.NewGuid().ToString(), deployment);
+
         }
 
         private string GetDSCDeploymenttemplateParameters(string resourceGroupName,