[release_4.0] Set the inproc net8 executable name based on operating system. (#3730) (#3733)

kshyju · azfuncgh · web-flow · commit 807e89766a92 · 2024-06-27T16:05:07.000-07:00
* Set the inproc net8 executable name based on operating system. (#3730) * adding more increased timeouts * increasing the timeout of node test because 'npm install' is taking longer --------- Co-authored-by: azfuncgh <azfuncgh@github.com>
diff --git a/src/Azure.Functions.Cli/Actions/HostActions/StartHostAction.cs b/src/Azure.Functions.Cli/Actions/HostActions/StartHostAction.cs
@@ -41,6 +41,9 @@ internal class StartHostAction : BaseAction
         private const int DefaultPort = 7071;
         private const int DefaultTimeout = 20;
         private const string Net6FrameworkDescriptionPrefix = ".NET 6.0";
+        private const string WindowsExecutableName = "func.exe";
+        private const string LinuxExecutableName = "func";
+        private const string InProc8DirectoryName = "in-proc8";
         private readonly ISecretsManager _secretsManager;
         private readonly IProcessManager _processManager;
         private IConfigurationRoot _hostJsonConfig;
@@ -472,7 +475,8 @@ public override async Task RunAsync()
                 // Checking if in Limelight - it should have a `AzureDevSessionsRemoteHostName` value in local.settings.json.
                 var forwardedHttpUrl = _secretsManager.GetSecrets().FirstOrDefault(
                     s => s.Key.Equals(Constants.AzureDevSessionsRemoteHostName, StringComparison.OrdinalIgnoreCase)).Value;
-                if (forwardedHttpUrl != null){
+                if (forwardedHttpUrl != null)
+                {
                     var baseUrl = forwardedHttpUrl.Replace(Constants.AzureDevSessionsPortSuffixPlaceholder, Port.ToString(), StringComparison.OrdinalIgnoreCase);
                     baseUri = new Uri(baseUrl);
                 }
@@ -486,6 +490,14 @@ public override async Task RunAsync()
             await runTask;
         }
 
+        private static string GetInProcNet8ExecutablePath()
+        {
+            var funcExecutableDirectory = Path.GetDirectoryName(typeof(StartHostAction).Assembly.Location)!;
+            var executableName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? WindowsExecutableName : LinuxExecutableName;
+
+            return Path.Combine(funcExecutableDirectory, InProc8DirectoryName, executableName);
+        }
+
         private Task StartInProc8AsChildProcessAsync()
         {
             if (VerboseLogging == true)
@@ -495,8 +507,8 @@ private Task StartInProc8AsChildProcessAsync()
 
             var commandLineArguments = string.Join(" ", Environment.GetCommandLineArgs().Skip(1));
             var tcs = new TaskCompletionSource();
-            var funcExecutableDirectory = Path.GetDirectoryName(typeof(StartHostAction).Assembly.Location)!;
-            var inProc8FuncExecutablePath = Path.Combine(funcExecutableDirectory, "in-proc8", "func.exe");
+
+            var inProc8FuncExecutablePath = GetInProcNet8ExecutablePath();
 
             EnsureNet8FuncExecutablePresent(inProc8FuncExecutablePath);
 
diff --git a/test/Azure.Functions.Cli.Tests/E2E/CreateFunctionTests.cs b/test/Azure.Functions.Cli.Tests/E2E/CreateFunctionTests.cs
@@ -61,7 +61,7 @@ await CliTester.Run(new RunConfiguration
                 {
                     "Authorization level is applicable to templates that use Http trigger, Allowed values: [function, anonymous, admin]. Authorization level is not enforced when running functions from core tools"
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -157,7 +157,7 @@ await CliTester.Run(new RunConfiguration
                     "\\src\\functions\\testfunc.js",
                     "The function \"testfunc\" was created successfully from the \"http trigger\" template."
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -210,7 +210,7 @@ await CliTester.Run(new RunConfiguration
                     "\\src\\functions\\testfunc.js",
                     "The function \"testfunc\" was created successfully from the \"httptrigger\" template."
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -229,7 +229,7 @@ await CliTester.Run(new RunConfiguration
                     "\\src\\functions\\testfunc.js",
                     "The function \"testfunc\" was created successfully from the \"httptrigger\" template."
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -296,7 +296,7 @@ await CliTester.Run(new RunConfiguration
                     "\\src\\functions\\testfunc.ts",
                     "The function \"testfunc\" was created successfully from the \"http trigger\" template."
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -364,7 +364,7 @@ await CliTester.Run(new RunConfiguration
                     "\\src\\functions\\testfunc.ts",
                     "The function \"testfunc\" was created successfully from the \"azure Blob Storage trigger\" template."
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
diff --git a/test/Azure.Functions.Cli.Tests/E2E/InitTests.cs b/test/Azure.Functions.Cli.Tests/E2E/InitTests.cs
@@ -155,7 +155,7 @@ public Task init_with_worker_runtime_and_model(string workerRuntime, string prog
                     $".vscode{Path.DirectorySeparatorChar}extensions.json",
                 },
                 OutputDoesntContain = new[] { "Initialized empty Git repository" },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -278,6 +278,7 @@ public Task init_with_no_source_control()
                 {
                     new DirectoryResult { Name = ".git", Exists = false }
                 },
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -298,7 +299,7 @@ public Task init_with_Dockerfile(string workerRuntime, string version)
                         ContentContains = new[] { $"FROM mcr.microsoft.com/azure-functions/{workerRuntime}:{version}" }
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120),
+                CommandTimeout = TimeSpan.FromSeconds(300),
                 OutputContains = new[] { "Dockerfile" }
             }, _output);
         }
@@ -480,7 +481,7 @@ public Task init_ts_app_using_lang(string initCommand)
                     "Writing Dockerfile",
                     "Writing .dockerignore"
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -510,7 +511,7 @@ public Task javascript_adds_packagejson()
                     "Writing local.settings.json",
                     $".vscode{Path.DirectorySeparatorChar}extensions.json",
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -581,7 +582,7 @@ public Task init_docker_only_for_existing_project(string workerRuntime, string v
                     }
                 },
                 OutputContains = new[] { "Dockerfile" },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -714,7 +715,7 @@ public Task init_function_app_contains_logging_config()
                 {
                     "Writing host.json"
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
diff --git a/test/Azure.Functions.Cli.Tests/E2E/SettingsTests.cs b/test/Azure.Functions.Cli.Tests/E2E/SettingsTests.cs
@@ -33,7 +33,7 @@ await CliTester.Run(new RunConfiguration
                         }
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -66,7 +66,7 @@ await CliTester.Run(new RunConfiguration[]
                             }
                         }
                     },
-                    CommandTimeout = TimeSpan.FromSeconds(120)
+                    CommandTimeout = TimeSpan.FromSeconds(300)
                 },
                 new RunConfiguration
                 {
diff --git a/test/Azure.Functions.Cli.Tests/E2E/StartTests.cs b/test/Azure.Functions.Cli.Tests/E2E/StartTests.cs
@@ -56,7 +56,7 @@ await CliTester.Run(new RunConfiguration
                         result.Should().Be("Hello, Test!", because: "response from default function should be 'Hello, {name}!'");
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120),
+                CommandTimeout = TimeSpan.FromSeconds(300),
             }, _output);
         }
 
@@ -93,7 +93,7 @@ await CliTester.Run(new RunConfiguration
                         result.Should().Be("Hello, Test. This HTTP triggered function executed successfully.", because: "response from default function should be 'Hello, {name}. This HTTP triggered function executed successfully.'");
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120),
+                CommandTimeout = TimeSpan.FromSeconds(300),
             }, _output);
         }
 
@@ -118,7 +118,7 @@ await CliTester.Run(new RunConfiguration
                     await Task.Delay(TimeSpan.FromSeconds(15));
                     p.Kill();
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
 
         }
@@ -145,7 +145,7 @@ await CliTester.Run(new RunConfiguration
                     await Task.Delay(TimeSpan.FromSeconds(15));
                     p.Kill();
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120),
+                CommandTimeout = TimeSpan.FromSeconds(300),
             }, _output);
         }
 
@@ -257,6 +257,7 @@ await CliTester.Run(new RunConfiguration[]
                         string hostJsonContent = "{\"version\": \"2.0\",\"logging\": {\"logLevel\": {\"Default\": \"None\"}}}";
                         await File.WriteAllTextAsync(filePath, hostJsonContent);
                     },
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                 },
                 new RunConfiguration
                 {
@@ -278,7 +279,8 @@ await CliTester.Run(new RunConfiguration[]
                         // give the host time to load functions and print any errors
                         await Task.Delay(TimeSpan.FromSeconds(10));
                         p.Kill();
-                    }
+                    },
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                 },
             }, _output, startHost: true);
         }
@@ -307,7 +309,7 @@ await CliTester.Run(new RunConfiguration
                         result.Should().Be("Hello, Test. This HTTP triggered function executed successfully.", because: "response from default function should be 'Hello, {name}. This HTTP triggered function executed successfully.'");
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120),
+                CommandTimeout = TimeSpan.FromSeconds(300),
             }, _output);
         }
 
@@ -342,7 +344,7 @@ await CliTester.Run(new RunConfiguration
                         }
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120),
+                CommandTimeout = TimeSpan.FromSeconds(300),
             }, _output);
         }
 
@@ -366,7 +368,8 @@ await CliTester.Run(new RunConfiguration[]
                         var functionJson = await File.ReadAllTextAsync(filePath);
                         functionJson = functionJson.Replace("\"type\": \"http\"", "\"type\": \"http2\"");
                         await File.WriteAllTextAsync(filePath, functionJson);
-                    }
+                    },
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                 },
                 new RunConfiguration
                 {
@@ -478,7 +481,7 @@ await CliTester.Run(new RunConfiguration
                     ExpectExit = true,
                     ExitInError = true,
                     ErrorContains = new[] { "Port 8081 is unavailable" },
-                    CommandTimeout = TimeSpan.FromSeconds(120),
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                 }, _output);
             }
             finally
@@ -506,7 +509,8 @@ await CliTester.Run(new RunConfiguration[]
                         var content = File.ReadAllText(settingsFile);
                         content = content.Replace("EMPTY_VALUE", "");
                         File.WriteAllText(settingsFile,content);
-                    }
+                    },
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                 },
                 new RunConfiguration
                 {
@@ -540,7 +544,7 @@ await CliTester.Run(new RunConfiguration[]
                     {
                         "Skipping 'emptySetting' from local settings as it's already defined in current environment variables."
                     },
-                    CommandTimeout = TimeSpan.FromSeconds(120),
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                 }
             }, _output);
         }
@@ -603,7 +607,7 @@ await CliTester.Run(new RunConfiguration
                         p.Kill();
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -669,7 +673,7 @@ await CliTester.Run(new RunConfiguration[]
                     {
                         "Using for user secrets file configuration."
                     },
-                    CommandTimeout = TimeSpan.FromSeconds(120),
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                     Test = async (workingDir, p) =>
                     {
                         using (var client = new HttpClient() { BaseAddress = new Uri("http://localhost:7071/") })
@@ -743,7 +747,7 @@ await CliTester.Run(new RunConfiguration[]
                     {
                         "start --functions http1 --csharp",
                     },
-                    CommandTimeout = TimeSpan.FromSeconds(120),
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                     ExpectExit = true,
                     ExitInError = true,
                     ErrorContains = new[] { "Missing value for AzureWebJobsStorage in local.settings.json and User Secrets. This is required for all triggers other than httptrigger, kafkatrigger. You can run 'func azure functionapp fetch-app-settings <functionAppName>' or specify a connection string in local.settings.json or User Secrets." },
diff --git a/test/Azure.Functions.Cli.Tests/ExtensionsTests/ExtensionBundleTests.cs b/test/Azure.Functions.Cli.Tests/ExtensionsTests/ExtensionBundleTests.cs
@@ -28,7 +28,7 @@ public Task BundleConfiguredByDefault_no_action()
                 {
                     "No action performed"
                 },
-                CommandTimeout = TimeSpan.FromMinutes(3)
+                CommandTimeout = TimeSpan.FromMinutes(300)
             }, _output);
         }
 
@@ -47,7 +47,7 @@ public Task BundleConfiguredByDefault_findsBundlePath()
                 {
                     bundlePath
                 },
-                CommandTimeout = TimeSpan.FromMinutes(3)
+                CommandTimeout = TimeSpan.FromMinutes(300)
             }, _output);
         }
 
@@ -66,7 +66,7 @@ public Task BundleNotConfiguredByDefault_showsErrorMessage()
                 {
                     "Extension bundle not configured."
                 },
-                CommandTimeout = TimeSpan.FromMinutes(3)
+                CommandTimeout = TimeSpan.FromMinutes(300)
             }, _output);
         }
     }
diff --git a/test/Azure.Functions.Cli.Tests/ExtensionsTests/InstallExtensionsTests.cs b/test/Azure.Functions.Cli.Tests/ExtensionsTests/InstallExtensionsTests.cs
@@ -40,7 +40,7 @@ public Task try_install_with_no_valid_trigger()
                         Exists = false
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public Task init_with_worker_runtime_and_model(string workerRuntime, string prog`
`155`	`155`	`$".vscode{Path.DirectorySeparatorChar}extensions.json",`
`156`	`156`	`},`
`157`	`157`	`OutputDoesntContain = new[] { "Initialized empty Git repository" },`
`158`		`- CommandTimeout = TimeSpan.FromSeconds(120)`
	`158`	`+ CommandTimeout = TimeSpan.FromSeconds(300)`
`159`	`159`	`}, _output);`
`160`	`160`	`}`
`161`	`161`
`@@ -278,6 +278,7 @@ public Task init_with_no_source_control()`
`278`	`278`	`{`
`279`	`279`	`new DirectoryResult { Name = ".git", Exists = false }`
`280`	`280`	`},`
	`281`	`+ CommandTimeout = TimeSpan.FromSeconds(300)`
`281`	`282`	`}, _output);`
`282`	`283`	`}`
`283`	`284`
`@@ -298,7 +299,7 @@ public Task init_with_Dockerfile(string workerRuntime, string version)`
`298`	`299`	`ContentContains = new[] { $"FROM mcr.microsoft.com/azure-functions/{workerRuntime}:{version}" }`
`299`	`300`	`}`
`300`	`301`	`},`
`301`		`- CommandTimeout = TimeSpan.FromSeconds(120),`
	`302`	`+ CommandTimeout = TimeSpan.FromSeconds(300),`
`302`	`303`	`OutputContains = new[] { "Dockerfile" }`
`303`	`304`	`}, _output);`
`304`	`305`	`}`
`@@ -480,7 +481,7 @@ public Task init_ts_app_using_lang(string initCommand)`
`480`	`481`	`"Writing Dockerfile",`
`481`	`482`	`"Writing .dockerignore"`
`482`	`483`	`},`
`483`		`- CommandTimeout = TimeSpan.FromSeconds(120)`
	`484`	`+ CommandTimeout = TimeSpan.FromSeconds(300)`
`484`	`485`	`}, _output);`
`485`	`486`	`}`
`486`	`487`
`@@ -510,7 +511,7 @@ public Task javascript_adds_packagejson()`
`510`	`511`	`"Writing local.settings.json",`
`511`	`512`	`$".vscode{Path.DirectorySeparatorChar}extensions.json",`
`512`	`513`	`},`
`513`		`- CommandTimeout = TimeSpan.FromSeconds(120)`
	`514`	`+ CommandTimeout = TimeSpan.FromSeconds(300)`
`514`	`515`	`}, _output);`
`515`	`516`	`}`
`516`	`517`
`@@ -581,7 +582,7 @@ public Task init_docker_only_for_existing_project(string workerRuntime, string v`
`581`	`582`	`}`
`582`	`583`	`},`
`583`	`584`	`OutputContains = new[] { "Dockerfile" },`
`584`		`- CommandTimeout = TimeSpan.FromSeconds(120)`
	`585`	`+ CommandTimeout = TimeSpan.FromSeconds(300)`
`585`	`586`	`}, _output);`
`586`	`587`	`}`
`587`	`588`
`@@ -714,7 +715,7 @@ public Task init_function_app_contains_logging_config()`
`714`	`715`	`{`
`715`	`716`	`"Writing host.json"`
`716`	`717`	`},`
`717`		`- CommandTimeout = TimeSpan.FromSeconds(120)`
	`718`	`+ CommandTimeout = TimeSpan.FromSeconds(300)`
`718`	`719`	`}, _output);`
`719`	`720`	`}`
`720`	`721`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ await CliTester.Run(new RunConfiguration`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`},`
`36`		`- CommandTimeout = TimeSpan.FromSeconds(120)`
	`36`	`+ CommandTimeout = TimeSpan.FromSeconds(300)`
`37`	`37`	`}, _output);`
`38`	`38`	`}`
`39`	`39`
`@@ -66,7 +66,7 @@ await CliTester.Run(new RunConfiguration[]`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`},`
`69`		`- CommandTimeout = TimeSpan.FromSeconds(120)`
	`69`	`+ CommandTimeout = TimeSpan.FromSeconds(300)`
`70`	`70`	`},`
`71`	`71`	`new RunConfiguration`
`72`	`72`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ await CliTester.Run(new RunConfiguration`
`56`	`56`	`result.Should().Be("Hello, Test!", because: "response from default function should be 'Hello, {name}!'");`
`57`	`57`	`}`
`58`	`58`	`},`
`59`		`- CommandTimeout = TimeSpan.FromSeconds(120),`
	`59`	`+ CommandTimeout = TimeSpan.FromSeconds(300),`
`60`	`60`	`}, _output);`
`61`	`61`	`}`
`62`	`62`
`@@ -93,7 +93,7 @@ await CliTester.Run(new RunConfiguration`
`93`	`93`	`result.Should().Be("Hello, Test. This HTTP triggered function executed successfully.", because: "response from default function should be 'Hello, {name}. This HTTP triggered function executed successfully.'");`
`94`	`94`	`}`
`95`	`95`	`},`
`96`		`- CommandTimeout = TimeSpan.FromSeconds(120),`
	`96`	`+ CommandTimeout = TimeSpan.FromSeconds(300),`
`97`	`97`	`}, _output);`
`98`	`98`	`}`
`99`	`99`
`@@ -118,7 +118,7 @@ await CliTester.Run(new RunConfiguration`
`118`	`118`	`await Task.Delay(TimeSpan.FromSeconds(15));`
`119`	`119`	`p.Kill();`
`120`	`120`	`},`
`121`		`- CommandTimeout = TimeSpan.FromSeconds(120)`
	`121`	`+ CommandTimeout = TimeSpan.FromSeconds(300)`
`122`	`122`	`}, _output);`
`123`	`123`
`124`	`124`	`}`
`@@ -145,7 +145,7 @@ await CliTester.Run(new RunConfiguration`
`145`	`145`	`await Task.Delay(TimeSpan.FromSeconds(15));`
`146`	`146`	`p.Kill();`
`147`	`147`	`},`
`148`		`- CommandTimeout = TimeSpan.FromSeconds(120),`
	`148`	`+ CommandTimeout = TimeSpan.FromSeconds(300),`
`149`	`149`	`}, _output);`
`150`	`150`	`}`
`151`	`151`
`@@ -257,6 +257,7 @@ await CliTester.Run(new RunConfiguration[]`
`257`	`257`	`string hostJsonContent = "{\"version\": \"2.0\",\"logging\": {\"logLevel\": {\"Default\": \"None\"}}}";`
`258`	`258`	`await File.WriteAllTextAsync(filePath, hostJsonContent);`
`259`	`259`	`},`
	`260`	`+ CommandTimeout = TimeSpan.FromSeconds(300),`
`260`	`261`	`},`
`261`	`262`	`new RunConfiguration`
`262`	`263`	`{`
`@@ -278,7 +279,8 @@ await CliTester.Run(new RunConfiguration[]`
`278`	`279`	`// give the host time to load functions and print any errors`
`279`	`280`	`await Task.Delay(TimeSpan.FromSeconds(10));`
`280`	`281`	`p.Kill();`
`281`		`- }`
	`282`	`+ },`
	`283`	`+ CommandTimeout = TimeSpan.FromSeconds(300),`
`282`	`284`	`},`
`283`	`285`	`}, _output, startHost: true);`
`284`	`286`	`}`
`@@ -307,7 +309,7 @@ await CliTester.Run(new RunConfiguration`
`307`	`309`	`result.Should().Be("Hello, Test. This HTTP triggered function executed successfully.", because: "response from default function should be 'Hello, {name}. This HTTP triggered function executed successfully.'");`
`308`	`310`	`}`
`309`	`311`	`},`
`310`		`- CommandTimeout = TimeSpan.FromSeconds(120),`
	`312`	`+ CommandTimeout = TimeSpan.FromSeconds(300),`
`311`	`313`	`}, _output);`
`312`	`314`	`}`
`313`	`315`
`@@ -342,7 +344,7 @@ await CliTester.Run(new RunConfiguration`
`342`	`344`	`}`
`343`	`345`	`}`
`344`	`346`	`},`
`345`		`- CommandTimeout = TimeSpan.FromSeconds(120),`
	`347`	`+ CommandTimeout = TimeSpan.FromSeconds(300),`
`346`	`348`	`}, _output);`
`347`	`349`	`}`
`348`	`350`
`@@ -366,7 +368,8 @@ await CliTester.Run(new RunConfiguration[]`
`366`	`368`	`var functionJson = await File.ReadAllTextAsync(filePath);`
`367`	`369`	`functionJson = functionJson.Replace("\"type\": \"http\"", "\"type\": \"http2\"");`
`368`	`370`	`await File.WriteAllTextAsync(filePath, functionJson);`
`369`		`- }`
	`371`	`+ },`
	`372`	`+ CommandTimeout = TimeSpan.FromSeconds(300),`
`370`	`373`	`},`
`371`	`374`	`new RunConfiguration`
`372`	`375`	`{`
`@@ -478,7 +481,7 @@ await CliTester.Run(new RunConfiguration`
`478`	`481`	`ExpectExit = true,`
`479`	`482`	`ExitInError = true,`
`480`	`483`	`ErrorContains = new[] { "Port 8081 is unavailable" },`
`481`		`- CommandTimeout = TimeSpan.FromSeconds(120),`
	`484`	`+ CommandTimeout = TimeSpan.FromSeconds(300),`
`482`	`485`	`}, _output);`
`483`	`486`	`}`
`484`	`487`	`finally`
`@@ -506,7 +509,8 @@ await CliTester.Run(new RunConfiguration[]`
`506`	`509`	`var content = File.ReadAllText(settingsFile);`
`507`	`510`	`content = content.Replace("EMPTY_VALUE", "");`
`508`	`511`	`File.WriteAllText(settingsFile,content);`
`509`		`- }`
	`512`	`+ },`
	`513`	`+ CommandTimeout = TimeSpan.FromSeconds(300),`
`510`	`514`	`},`
`511`	`515`	`new RunConfiguration`
`512`	`516`	`{`
`@@ -540,7 +544,7 @@ await CliTester.Run(new RunConfiguration[]`
`540`	`544`	`{`
`541`	`545`	`"Skipping 'emptySetting' from local settings as it's already defined in current environment variables."`
`542`	`546`	`},`
`543`		`- CommandTimeout = TimeSpan.FromSeconds(120),`
	`547`	`+ CommandTimeout = TimeSpan.FromSeconds(300),`
`544`	`548`	`}`
`545`	`549`	`}, _output);`
`546`	`550`	`}`
`@@ -603,7 +607,7 @@ await CliTester.Run(new RunConfiguration`
`603`	`607`	`p.Kill();`
`604`	`608`	`}`
`605`	`609`	`},`
`606`		`- CommandTimeout = TimeSpan.FromSeconds(120)`
	`610`	`+ CommandTimeout = TimeSpan.FromSeconds(300)`
`607`	`611`	`}, _output);`
`608`	`612`	`}`
`609`	`613`
`@@ -669,7 +673,7 @@ await CliTester.Run(new RunConfiguration[]`
`669`	`673`	`{`
`670`	`674`	`"Using for user secrets file configuration."`
`671`	`675`	`},`
`672`		`- CommandTimeout = TimeSpan.FromSeconds(120),`
	`676`	`+ CommandTimeout = TimeSpan.FromSeconds(300),`
`673`	`677`	`Test = async (workingDir, p) =>`
`674`	`678`	`{`
`675`	`679`	`using (var client = new HttpClient() { BaseAddress = new Uri("http://localhost:7071/") })`
`@@ -743,7 +747,7 @@ await CliTester.Run(new RunConfiguration[]`
`743`	`747`	`{`
`744`	`748`	`"start --functions http1 --csharp",`
`745`	`749`	`},`
`746`		`- CommandTimeout = TimeSpan.FromSeconds(120),`
	`750`	`+ CommandTimeout = TimeSpan.FromSeconds(300),`
`747`	`751`	`ExpectExit = true,`
`748`	`752`	`ExitInError = true,`
`749`	`753`	`ErrorContains = new[] { "Missing value for AzureWebJobsStorage in local.settings.json and User Secrets. This is required for all triggers other than httptrigger, kafkatrigger. You can run 'func azure functionapp fetch-app-settings <functionAppName>' or specify a connection string in local.settings.json or User Secrets." },`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public Task BundleConfiguredByDefault_no_action()`
`28`	`28`	`{`
`29`	`29`	`"No action performed"`
`30`	`30`	`},`
`31`		`- CommandTimeout = TimeSpan.FromMinutes(3)`
	`31`	`+ CommandTimeout = TimeSpan.FromMinutes(300)`
`32`	`32`	`}, _output);`
`33`	`33`	`}`
`34`	`34`
`@@ -47,7 +47,7 @@ public Task BundleConfiguredByDefault_findsBundlePath()`
`47`	`47`	`{`
`48`	`48`	`bundlePath`
`49`	`49`	`},`
`50`		`- CommandTimeout = TimeSpan.FromMinutes(3)`
	`50`	`+ CommandTimeout = TimeSpan.FromMinutes(300)`
`51`	`51`	`}, _output);`
`52`	`52`	`}`
`53`	`53`
`@@ -66,7 +66,7 @@ public Task BundleNotConfiguredByDefault_showsErrorMessage()`
`66`	`66`	`{`
`67`	`67`	`"Extension bundle not configured."`
`68`	`68`	`},`
`69`		`- CommandTimeout = TimeSpan.FromMinutes(3)`
	`69`	`+ CommandTimeout = TimeSpan.FromMinutes(300)`
`70`	`70`	`}, _output);`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public Task try_install_with_no_valid_trigger()`
`40`	`40`	`Exists = false`
`41`	`41`	`}`
`42`	`42`	`},`
`43`		`- CommandTimeout = TimeSpan.FromSeconds(120)`
	`43`	`+ CommandTimeout = TimeSpan.FromSeconds(300)`
`44`	`44`	`}, _output);`
`45`	`45`	`}`
`46`	`46`