fixing tests...

Author: brettsam

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

@@ -103,25 +103,25 @@ public static void RunProcess(string fileName, string arguments, string workingD
                 CreateNoWindow = true,
                 UseShellExecute = false,
                 WorkingDirectory = workingDirectory,
-                FileName = fileName,
+                RedirectStandardOutput = true,
                 RedirectStandardError = true,
-                RedirectStandardOutput = true
+                FileName = fileName
             };
 
             if (!string.IsNullOrEmpty(arguments))
             {
                 startInfo.Arguments = arguments;
             }
 
-            Process testProcess = Process.Start(startInfo);
-            string standardOut = null;
-            string standardError = null;
+            Process testProcess = new()
+            {
+                StartInfo = startInfo,
+            };
 
             testProcess.OutputDataReceived += (sender, e) =>
             {
                 if (e.Data != null)
                 {
-                    standardOut = e.Data + Environment.NewLine;
                     writeOutput?.Invoke(e.Data);
                 }
             };
@@ -130,31 +130,35 @@ public static void RunProcess(string fileName, string arguments, string workingD
             {
                 if (e.Data != null)
                 {
-                    standardOut += e.Data + Environment.NewLine;
                     writeError?.Invoke(e.Data);
                 }
             };
 
-            bool completed = testProcess.WaitForExit((int)procTimeout.TotalMilliseconds);
+            testProcess.Start();
+            testProcess.BeginOutputReadLine();
+            testProcess.BeginErrorReadLine();
 
-            if (!completed)
+            bool completed = false;
+            try
             {
-                testProcess.Kill();
-                throw new TimeoutException($"Process '{fileName} {arguments}' in working directory '{workingDirectory}' did not complete in {procTimeout}.");
+                completed = testProcess.WaitForExit((int)procTimeout.TotalMilliseconds);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Process '{fileName} {arguments}' in working directory '{workingDirectory}' threw exception '{ex}'.");
             }
 
-            if (testProcess.ExitCode != 0)
+            if (!completed)
             {
-                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}");
+                throw new TimeoutException($"Process '{fileName} {arguments}' in working directory '{workingDirectory}' did not complete in {procTimeout}.");
             }
         }
 
         private static string ExecuteCommand(string command)
         {
-            string output = null;
+            string output = string.Empty;
 
-            RunProcess(CommandExe, command, null, writeOutput: o => output = o);
+            RunProcess(CommandExe, command, null, writeOutput: o => output += o + Environment.NewLine);
 
             return output;
         }

test/Azure.Functions.Cli.Tests/E2E/StartTests.cs

@@ -1,17 +1,17 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Net;
 using System.Net.Http;
+using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
+using Azure.Functions.Cli.Common;
 using Azure.Functions.Cli.Tests.E2E.Helpers;
 using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
-using System.Net.Sockets;
-using System.Net;
-using System.Diagnostics;
-using Azure.Functions.Cli.Common;
 
 namespace Azure.Functions.Cli.Tests.E2E
 {
@@ -976,7 +976,7 @@ await CliTester.Run(new RunConfiguration[]
                     },
                     Test = async (_, p, stdout) =>
                     {
-                        await LogWatcher.WaitForLogOutput(stdout, "Initializing function HTTP routes", TimeSpan.FromSeconds(5));
+                        await LogWatcher.WaitForLogOutput(stdout, "Worker process started and initialized", TimeSpan.FromSeconds(5));
                         p.Kill();
                     },
                     CommandTimeout = TimeSpan.FromSeconds(300)