trying to get other inproc tests passing

aishwaryabh · aishwaryabh · commit cde58bc77b0f · 2025-04-23T13:49:00.000-07:00
diff --git a/test/Cli/Func.E2E.Tests/Commands/FuncStart/AuthTests.cs b/test/Cli/Func.E2E.Tests/Commands/FuncStart/AuthTests.cs
@@ -27,14 +27,14 @@ public async Task Start_DotnetIsolated_EnableAuthFeature(
             var uniqueTestName = $"{methodName}_{authLevel}_{enableAuth}";
 
             // Call func init and func new
-            await FuncInitWithRetryAsync(uniqueTestName, new[] { ".", "--worker-runtime", "dotnet-isolated" });
-            await FuncNewWithRetryAsync(uniqueTestName, new[] { ".", "--template", "Httptrigger", "--name", "HttpTrigger", "--authlevel", authLevel });
+            await FuncInitWithRetryAsync(uniqueTestName, [".", "--worker-runtime", "dotnet-isolated"]);
+            await FuncNewWithRetryAsync(uniqueTestName, [".", "--template", "Httptrigger", "--name", "HttpTrigger", "--authlevel", authLevel]);
 
             // Call func start
             var funcStartCommand = new FuncStartCommand(FuncPath, methodName, Log);
             funcStartCommand.ProcessStartedHandler = async (process) =>
             {
-                await ProcessHelper.ProcessStartedHandlerHelper(port, process, funcStartCommand.FileWriter ?? throw new ArgumentNullException(nameof(funcStartCommand.FileWriter)), "HttpTrigger");
+                await ProcessHelper.ProcessStartedHandlerHelper(port, process, funcStartCommand.FileWriter ?? throw new ArgumentNullException(nameof(funcStartCommand)), "HttpTrigger");
             };
 
             // Build command arguments based on enableAuth parameter
diff --git a/test/Cli/Func.E2E.Tests/Commands/FuncStart/Core/BaseMissingConfigTests.cs b/test/Cli/Func.E2E.Tests/Commands/FuncStart/Core/BaseMissingConfigTests.cs
@@ -89,14 +89,14 @@ public async Task RunMissingLocalSettingsJsonTest(string language, string runtim
 
                 funcStartCommand.ProcessStartedHandler = async (process) =>
                 {
-                    // Wait for host to start up if param is set, otherwise just wait 1 second for logs and kill the process
+                    // Wait for host to start up if param is set, otherwise just wait 5 seconds for logs and kill the process
                     if (shouldWaitForHost)
                     {
                         await ProcessHelper.ProcessStartedHandlerHelper(port, process, funcStartCommand.FileWriter ?? throw new ArgumentNullException(nameof(funcStartCommand.FileWriter)), "HttpTriggerFunc");
                     }
                     else
                     {
-                        await Task.Delay(1000);
+                        await Task.Delay(5000);
                         process.Kill(true);
                     }
                 };
diff --git a/test/Cli/Func.E2E.Tests/Commands/FuncStart/InProcTests/InProcTestWithoutTargetFramework.cs b/test/Cli/Func.E2E.Tests/Commands/FuncStart/InProcTests/InProcTestWithoutTargetFramework.cs
@@ -1,11 +1,11 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using Azure.Functions.Cli.E2E.Tests.Traits;
 using Azure.Functions.Cli.TestFramework.Assertions;
 using Azure.Functions.Cli.TestFramework.Commands;
 using Azure.Functions.Cli.TestFramework.Helpers;
 using FluentAssertions;
-using Func.E2ETests.Traits;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/test/Cli/Func.E2E.Tests/Commands/FuncStart/InProcTests/LogLevelTests.cs b/test/Cli/Func.E2E.Tests/Commands/FuncStart/InProcTests/LogLevelTests.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Azure.Functions.Cli.E2E.Tests.Commands.FuncStart.Core;
-using Func.E2ETests.Traits;
+using Azure.Functions.Cli.E2E.Tests.Traits;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/test/Cli/Func.E2E.Tests/Commands/FuncStart/InProcTests/MissingConfigTests.cs b/test/Cli/Func.E2E.Tests/Commands/FuncStart/InProcTests/MissingConfigTests.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Azure.Functions.Cli.E2E.Tests.Commands.FuncStart.Core;
-using Func.E2ETests.Traits;
+using Azure.Functions.Cli.E2E.Tests.Traits;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -26,7 +26,7 @@ public async Task Start_InProc_MissingHostJson_FailsWithExpectedError()
         [Theory]
         [InlineData("dotnet", "--worker-runtime None", "Use the up/down arrow keys to select a worker runtime:", false, false, false)] // Runtime parameter set to None, worker runtime prompt displayed
         [InlineData("dotnet", "", $"Use the up/down arrow keys to select a worker runtime:", false, false, false)] // Runtime parameter not provided, worker runtime prompt displayed
-        public async Task Start_InProc_MissingLocalSettingsJson_BehavesAsExpected(string language, string runtimeParameter, string expectedOutput, bool invokeFunction, bool setRuntimeViaEnvironment, bool shouldWaitForHost = true)
+        public async Task Start_InProc_MissingLocalSettingsJson_BehavesAsExpected(string language, string runtimeParameter, string expectedOutput, bool invokeFunction, bool setRuntimeViaEnvironment, bool shouldWaitForHost)
         {
             await RunMissingLocalSettingsJsonTest(language, runtimeParameter, expectedOutput, invokeFunction, setRuntimeViaEnvironment, nameof(Start_InProc_MissingLocalSettingsJson_BehavesAsExpected), shouldWaitForHost);
         }
diff --git a/test/Cli/Func.E2E.Tests/Commands/FuncStart/InProcTests/UserSecretsTests.cs b/test/Cli/Func.E2E.Tests/Commands/FuncStart/InProcTests/UserSecretsTests.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Azure.Functions.Cli.E2E.Tests.Commands.FuncStart.Core;
-using Func.E2ETests.Traits;
+using Azure.Functions.Cli.E2E.Tests.Traits;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/test/Cli/Func.E2E.Tests/Commands/FuncStart/InProcTests/VisualStudioInProcTests.cs b/test/Cli/Func.E2E.Tests/Commands/FuncStart/InProcTests/VisualStudioInProcTests.cs
@@ -1,11 +1,11 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using Azure.Functions.Cli.E2E.Tests.Traits;
 using Azure.Functions.Cli.TestFramework.Assertions;
 using Azure.Functions.Cli.TestFramework.Commands;
 using Azure.Functions.Cli.TestFramework.Helpers;
 using FluentAssertions;
-using Func.E2ETests.Traits;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/test/Cli/Func.E2E.Tests/Commands/FuncStart/TestsWithFixtures/DotnetInProc6Tests.cs b/test/Cli/Func.E2E.Tests/Commands/FuncStart/TestsWithFixtures/DotnetInProc6Tests.cs
@@ -2,11 +2,11 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Azure.Functions.Cli.E2E.Tests.Fixtures;
+using Azure.Functions.Cli.E2E.Tests.Traits;
 using Azure.Functions.Cli.TestFramework.Assertions;
 using Azure.Functions.Cli.TestFramework.Commands;
 using Azure.Functions.Cli.TestFramework.Helpers;
 using FluentAssertions;
-using Func.E2ETests.Traits;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/test/Cli/Func.E2E.Tests/Commands/FuncStart/TestsWithFixtures/DotnetInProc8Tests.cs b/test/Cli/Func.E2E.Tests/Commands/FuncStart/TestsWithFixtures/DotnetInProc8Tests.cs
@@ -2,11 +2,11 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Azure.Functions.Cli.E2E.Tests.Fixtures;
+using Azure.Functions.Cli.E2E.Tests.Traits;
 using Azure.Functions.Cli.TestFramework.Assertions;
 using Azure.Functions.Cli.TestFramework.Commands;
 using Azure.Functions.Cli.TestFramework.Helpers;
 using FluentAssertions;
-using Func.E2ETests.Traits;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/test/Cli/Func.E2E.Tests/Commands/FuncStart/TestsWithFixtures/DotnetIsolatedTests.cs b/test/Cli/Func.E2E.Tests/Commands/FuncStart/TestsWithFixtures/DotnetIsolatedTests.cs
@@ -2,11 +2,11 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Azure.Functions.Cli.E2E.Tests.Fixtures;
+using Azure.Functions.Cli.E2E.Tests.Traits;
 using Azure.Functions.Cli.TestFramework.Assertions;
 using Azure.Functions.Cli.TestFramework.Commands;
 using Azure.Functions.Cli.TestFramework.Helpers;
 using FluentAssertions;
-using Func.E2ETests.Traits;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -75,7 +75,7 @@ public void Start_DotnetIsolated_WithRuntimeSpecified_SuccessfulFunctionExecutio
                 because: "response from default function should be 'Welcome to Azure Functions!'");
 
             // Validate default host was started
-            result.Should().StartDefaultHost();
+            result.Should().HaveStdOutContaining("Selected default host.");
         }
 
         [Fact]
diff --git a/test/Cli/Func.E2E.Tests/Traits/TestTraits.cs b/test/Cli/Func.E2E.Tests/Traits/TestTraits.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-namespace Func.E2ETests.Traits
+namespace Azure.Functions.Cli.E2E.Tests.Traits
 {
     internal static class TestTraits
     {

Original file line number	Diff line number	Diff line change
`@@ -89,14 +89,14 @@ public async Task RunMissingLocalSettingsJsonTest(string language, string runtim`
`89`	`89`
`90`	`90`	`funcStartCommand.ProcessStartedHandler = async (process) =>`
`91`	`91`	`{`
`92`		`- // Wait for host to start up if param is set, otherwise just wait 1 second for logs and kill the process`
	`92`	`+ // Wait for host to start up if param is set, otherwise just wait 5 seconds for logs and kill the process`
`93`	`93`	`if (shouldWaitForHost)`
`94`	`94`	`{`
`95`	`95`	`await ProcessHelper.ProcessStartedHandlerHelper(port, process, funcStartCommand.FileWriter ?? throw new ArgumentNullException(nameof(funcStartCommand.FileWriter)), "HttpTriggerFunc");`
`96`	`96`	`}`
`97`	`97`	`else`
`98`	`98`	`{`
`99`		`- await Task.Delay(1000);`
	`99`	`+ await Task.Delay(5000);`
`100`	`100`	`process.Kill(true);`
`101`	`101`	`}`
`102`	`102`	`};`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT License. See LICENSE in the project root for license information.`
`3`	`3`
`4`		`-namespace Func.E2ETests.Traits`
	`4`	`+namespace Azure.Functions.Cli.E2E.Tests.Traits`
`5`	`5`	`{`
`6`	`6`	`internal static class TestTraits`
`7`	`7`	`{`