Fixing module path for compute PIR.psd1 and AzurePreview.psd1 modules

Author: Hovsep Mkrtchyan

src/Common/Commands.Common/CmdletExtensions.cs

@@ -25,7 +25,7 @@ public static class CmdletExtensions
     {
         public static string AsAbsoluteLocation(this string realtivePath)
         {
-            return Path.Combine(AppDomain.CurrentDomain.BaseDirectory, realtivePath);
+            return Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, realtivePath));
         }
 
         public static string TryResolvePath(this PSCmdlet psCmdlet, string path)

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

@@ -272,57 +272,81 @@ public void SetupModules(params string[] modules)
             this.modules.AddRange(modules);
         }
 
+
         public virtual Collection<PSObject> RunPowerShellTest(params string[] scripts)
         {
             using (var powershell = System.Management.Automation.PowerShell.Create(RunspaceMode.NewRunspace))
             {
-                SetupPowerShellModules(powershell);
+                return ExecuteShellTest(powershell, null, scripts);
+            }
+        }
+        public virtual Collection<PSObject> RunPowerShellTest(IEnumerable<string> setupScripts, IEnumerable<string> scripts)
+        {
+            using (var powershell = System.Management.Automation.PowerShell.Create(RunspaceMode.NewRunspace))
+            {
+                return ExecuteShellTest(powershell, setupScripts, scripts);
+            }
+        }
 
-                Collection<PSObject> output = null;
-                for (int i = 0; i < scripts.Length; ++i)
-                {
-                    Console.WriteLine(scripts[i]);
-                    powershell.AddScript(scripts[i]);
-                }
-                try
-                {
-                    powershell.Runspace.Events.Subscribers.Clear();
-                    powershell.Streams.Error.Clear();
-                    output = powershell.Invoke();
+        private Collection<PSObject> ExecuteShellTest(
+            System.Management.Automation.PowerShell powershell,
+            IEnumerable<string> setupScripts,
+            IEnumerable<string> scripts)
+        {
+            SetupPowerShellModules(powershell, null);
 
-                    if (powershell.Streams.Error.Count > 0)
-                    {
-                        var sb = new StringBuilder();
+            Collection<PSObject> output = null;
 
-                        sb.AppendLine("Test failed due to a non-empty error stream, check the error stream in the test log for more details.");
-                        sb.AppendLine(string.Format("{0} total Errors", powershell.Streams.Error.Count));
-                        foreach (var error in powershell.Streams.Error)
-                        {
-                            sb.AppendLine(error.Exception.ToString());
-                        }
+            foreach (var script in scripts)
+            {
+                Console.WriteLine(script);
+                powershell.AddScript(script);
+            }
+            try
+            {
+                powershell.Runspace.Events.Subscribers.Clear();
+                powershell.Streams.Error.Clear();
+                output = powershell.Invoke();
 
-                        throw new RuntimeException(sb.ToString());
+                if (powershell.Streams.Error.Count > 0)
+                {
+                    var sb = new StringBuilder();
+
+                    sb.AppendLine("Test failed due to a non-empty error stream, check the error stream in the test log for more details.");
+                    sb.AppendLine(string.Format("{0} total Errors", powershell.Streams.Error.Count));
+                    foreach (var error in powershell.Streams.Error)
+                    {
+                        sb.AppendLine(error.Exception.ToString());
                     }
 
-                    return output;
-                }
-                catch (Exception psException)
-                {
-                    powershell.LogPowerShellException(psException);
-                    throw;
-                }
-                finally
-                {
-                    powershell.LogPowerShellResults(output);
-                    powershell.Streams.Error.Clear();
+                    throw new RuntimeException(sb.ToString());
                 }
+
+                return output;
+            }
+            catch (Exception psException)
+            {
+                powershell.LogPowerShellException(psException);
+                throw;
+            }
+            finally
+            {
+                powershell.LogPowerShellResults(output);
+                powershell.Streams.Error.Clear();
             }
         }
 
-        private void SetupPowerShellModules(System.Management.Automation.PowerShell powershell)
+        private void SetupPowerShellModules(System.Management.Automation.PowerShell powershell, IEnumerable<string> setupScripts)
         {
             powershell.AddScript("$error.clear()");
             powershell.AddScript(string.Format("cd \"{0}\"", AppDomain.CurrentDomain.BaseDirectory));
+            if (setupScripts != null)
+            {
+                foreach(var script in setupScripts)
+                {
+                    powershell.AddScript(script);
+                }
+            }
 
             foreach (string moduleName in modules)
             {

src/ServiceManagement/Common/Commands.ScenarioTest/DiagnosticsExtension/DiagnosticsExtensionTests.cs

@@ -19,6 +19,7 @@
 using Microsoft.WindowsAzure.Management.Compute;
 using Microsoft.WindowsAzure.Management.Network;
 using Microsoft.WindowsAzure.Management.Storage;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System.Collections.Generic;
 using Xunit;
 
@@ -63,7 +64,13 @@ protected void RunPowerShellTest(params string[] scripts)
                 helper.SetupEnvironment(AzureModule.AzureServiceManagement);
                 helper.SetupModules(AzureModule.AzureServiceManagement, modules.ToArray());
 
-                helper.RunPowerShellTest(scripts);
+                var scriptEnvPath = new List<string>();
+                scriptEnvPath.Add(
+                    string.Format(
+                    "$env:PSModulePath=\"{0};$env:PSModulePath\"",
+                    @"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute".AsAbsoluteLocation()));
+
+                helper.RunPowerShellTest(scriptEnvPath, scripts);
             }
         }
 

src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ServiceManagementTests.cs

@@ -62,7 +62,13 @@ protected void RunPowerShellTest(params string[] scripts)
                 helper.SetupEnvironment(AzureModule.AzureServiceManagement);
                 helper.SetupModules(AzureModule.AzureServiceManagement, modules.ToArray());
 
-                helper.RunPowerShellTest(scripts);
+                var scriptEnvPath = new List<string>();
+                scriptEnvPath.Add(
+                    string.Format(
+                    "$env:PSModulePath=\"{0};$env:PSModulePath\"",
+                    Path.Combine(EnvironmentSetupHelper.PackageDirectory, @"ServiceManagement\Azure\Compute").AsAbsoluteLocation()));
+
+                helper.RunPowerShellTest(scriptEnvPath.ToArray(), scripts);
             }
         }
     }