Configure unbounded FunctionTimeout when user specifies -1, and add tests.

Author: gzuber

src/WebJobs.Script/Config/ScriptHostOptionsSetup.cs

@@ -70,13 +70,18 @@ public void Configure(ScriptJobHostOptions options)
 
         private void ConfigureFunctionTimeout(ScriptJobHostOptions options)
         {
-            if (options.FunctionTimeout != null)
+            if (options.FunctionTimeout == null)
             {
-                ValidateTimeoutValue(options, options.FunctionTimeout);
+                options.FunctionTimeout = _environment.IsDynamic() ? DefaultFunctionTimeoutDynamic : DefaultFunctionTimeout;
+            }
+            else if (!_environment.IsDynamic() && TimeSpan.Compare(options.FunctionTimeout.Value, TimeSpan.FromDays(-1)) == 0)
+            {
+                // If a value of -1 is specified on a dedicated host, it should result in an infinite timeout
+                options.FunctionTimeout = null;
             }
             else
             {
-                options.FunctionTimeout = _environment.IsDynamic() ? DefaultFunctionTimeoutDynamic : DefaultFunctionTimeout;
+                ValidateTimeoutValue(options, options.FunctionTimeout);
             }
         }
 

test/WebJobs.Script.Tests/Configuration/ScriptHostOptionsSetupTests.cs

@@ -158,6 +158,18 @@ public void Configure_NoMaxTimeoutLimits_IfNotDynamic()
             Assert.Equal(timeout, options.FunctionTimeout);
         }
 
+        [Fact]
+        public void Configure_AppliesInfiniteTimeout_IfNotDynamic()
+        {
+            var settings = new Dictionary<string, string>
+            {
+                { ConfigurationPath.Combine(ConfigurationSectionNames.JobHost, "functionTimeout"), "-1" }
+            };
+
+            var options = GetConfiguredOptions(settings);
+            Assert.Equal(null, options.FunctionTimeout);
+        }
+
         [Fact]
         public void Configure_AppliesTimeoutLimits_IfDynamic()
         {
@@ -177,6 +189,10 @@ public void Configure_AppliesTimeoutLimits_IfDynamic()
             settings[configPath] = (ScriptHostOptionsSetup.MinFunctionTimeout - TimeSpan.FromSeconds(1)).ToString();
             ex = Assert.Throws<ArgumentException>(() => GetConfiguredOptions(settings, environment));
             Assert.Equal(expectedMessage, ex.Message);
+
+            settings[configPath] = "-1";
+            ex = Assert.Throws<ArgumentException>(() => GetConfiguredOptions(settings, environment));
+            Assert.Equal(expectedMessage, ex.Message);
         }
 
         [Fact]