removing processwrapper

Author: brettsam

test/Azure.Functions.Cli.Tests/E2E/Helpers/ProcessHelper.cs

@@ -94,34 +94,69 @@ public static int GetAvailablePort()
             }
         }
 
-        private static string ExecuteCommand(string command)
+        public static void RunProcess(string fileName, string arguments, string workingDirectory, Action<string> writeOutput = null, Action<string> writeError = null)
         {
-            using (Process p = new Process())
-            {
-                string commandOut = string.Empty;
+            TimeSpan procTimeout = TimeSpan.FromMinutes(3);
 
-                p.StartInfo.FileName = CommandExe;
-                p.StartInfo.Arguments = command;
-                p.StartInfo.UseShellExecute = false;
-                p.StartInfo.CreateNoWindow = true;
-                p.StartInfo.RedirectStandardOutput = true;
-                p.StartInfo.RedirectStandardError = true;
-                p.Start();
+            ProcessStartInfo startInfo = new()
+            {
+                CreateNoWindow = true,
+                UseShellExecute = false,
+                WorkingDirectory = workingDirectory,
+                FileName = fileName,
+                RedirectStandardError = true,
+                RedirectStandardOutput = true
+            };
+
+            if (!string.IsNullOrEmpty(arguments))
+            {
+                startInfo.Arguments = arguments;
+            }
 
-                commandOut = p.StandardOutput.ReadToEnd();
-                string errors = p.StandardError.ReadToEnd();
+            Process testProcess = Process.Start(startInfo);
+            string standardOut = null;
+            string standardError = null;
 
-                try
+            testProcess.OutputDataReceived += (sender, e) =>
+            {
+                if (e.Data != null)
                 {
-                    p.WaitForExit(TimeSpan.FromSeconds(2).Milliseconds);
+                    standardOut = e.Data + Environment.NewLine;
+                    writeOutput?.Invoke(e.Data);
                 }
-                catch (Exception exp)
+            };
+
+            testProcess.ErrorDataReceived += (sender, e) =>
+            {
+                if (e.Data != null)
                 {
-                    Console.WriteLine(exp.ToString());
+                    standardOut += e.Data + Environment.NewLine;
+                    writeError?.Invoke(e.Data);
                 }
+            };
+
+            bool completed = testProcess.WaitForExit((int)procTimeout.TotalMilliseconds);
 
-                return commandOut;
+            if (!completed)
+            {
+                testProcess.Kill();
+                throw new TimeoutException($"Process '{fileName} {arguments}' in working directory '{workingDirectory}' did not complete in {procTimeout}.");
             }
+
+            if (testProcess.ExitCode != 0)
+            {
+                throw new InvalidOperationException($"Process '{fileName} {arguments}' in working directory '{workingDirectory}' exited with code '{testProcess.ExitCode}'.{Environment.NewLine}" +
+                    $"Output:{Environment.NewLine}{standardOut}{Environment.NewLine}Error:{Environment.NewLine}{standardError}");
+            }
+        }
+
+        private static string ExecuteCommand(string command)
+        {
+            string output = null;
+
+            RunProcess(CommandExe, command, null, writeOutput: o => output = o);
+
+            return output;
         }
     }
 }

test/Azure.Functions.Cli.Tests/ProcessWrapper.cs

@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Azure.Functions.Cli.Common;
 using Azure.Functions.Cli.Helpers;
+using Azure.Functions.Cli.Tests.E2E.Helpers;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -87,7 +88,7 @@ private async Task<string> BuildAndCopyFileToZipAsync(string rid)
             // build the project for the rid
             var csproj = dir.GetFiles($"{proj}.csproj", SearchOption.AllDirectories).FirstOrDefault();
             var csprojDir = csproj.Directory.FullName;
-            ProcessWrapper.RunProcess("dotnet", $"build -r {rid}", csprojDir, writeOutput: WriteOutput);
+            ProcessHelper.RunProcess("dotnet", $"build -r {rid}", csprojDir, writeOutput: WriteOutput);
 
             var outPath = Path.Combine(csprojDir, "bin", "Debug", "net8.0", rid);
 
@@ -118,7 +119,7 @@ private static void VerifyWindowsZip(string zipFile)
             string exeOutput = null;
             string exeError = null;
 
-            ProcessWrapper.RunProcess(Path.Combine(unzipPath, "ZippedExe.exe"), string.Empty, unzipPath, o => exeOutput = o, e => exeError = e);
+            ProcessHelper.RunProcess(Path.Combine(unzipPath, "ZippedExe.exe"), string.Empty, unzipPath, o => exeOutput += o + Environment.NewLine, e => exeError += e + Environment.NewLine);
 
             Assert.Equal(string.Empty, exeError);
             Assert.Equal("Hello, World!", exeOutput.Trim());
@@ -131,7 +132,7 @@ private void VerifyLinuxZip(string zipFile)
 
             void CaptureOutput(string output)
             {
-                stdout = output;
+                stdout += output + Environment.NewLine;
                 WriteOutput(output);
             }
 
@@ -142,10 +143,10 @@ void CaptureOutput(string output)
             Directory.CreateDirectory(mntDir);
 
             // this is what our hosting environment does; we need to validate we can run the exe when mounted like this
-            ProcessWrapper.RunProcess("fuse-zip", $"./{zipFileName} ./mnt -r", zipDir, writeOutput: CaptureOutput);
-            ProcessWrapper.RunProcess("bash", $"-c \"ls -l\"", mntDir, writeOutput: CaptureOutput);
+            ProcessHelper.RunProcess("fuse-zip", $"./{zipFileName} ./mnt -r", zipDir, writeOutput: CaptureOutput);
+            ProcessHelper.RunProcess("bash", $"-c \"ls -l\"", mntDir, writeOutput: CaptureOutput);
 
-            var outputLines = stdout.Split('\n', StringSplitOptions.RemoveEmptyEntries);
+            var outputLines = stdout.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
             Assert.Equal(14, outputLines.Length);
 
             // ignore first ('total ...') to validate file perms
@@ -184,8 +185,8 @@ void CaptureOutput(string output)
                 }
             }
 
-            ProcessWrapper.RunProcess($"{Path.Combine(mntDir, exeName)}", string.Empty, mntDir, writeOutput: CaptureOutput);
-            outputLines = stdout.Split('\n', StringSplitOptions.RemoveEmptyEntries);
+            ProcessHelper.RunProcess($"{Path.Combine(mntDir, exeName)}", string.Empty, mntDir, writeOutput: CaptureOutput);
+            outputLines = stdout.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
             Assert.Equal("Hello, World!", outputLines.Last());
         }