Trying to fix CI test runs

Author: mathewc

src/WebJobs.Script/Host/ScriptHost.cs

@@ -1359,7 +1359,7 @@ internal static void ApplyConfiguration(JObject config, ScriptHostConfiguration
             hostConfig.HostConfigMetadata = config;
 
             JArray functions = (JArray)config["functions"];
-            if (functions != null && functions.Count > 0)
+            if (scriptConfig.Functions == null && functions != null && functions.Count > 0)
             {
                 scriptConfig.Functions = new Collection<string>();
                 foreach (var function in functions)

test/WebJobs.Script.Tests.Integration/Host/WebScriptHostManagerTimeoutTests.cs

@@ -28,7 +28,7 @@ public async Task OnTimeoutException_IgnoreToken_StopsManager()
 
             await RunTimeoutExceptionTest(trace, handleCancellation: false);
 
-            await TestHelpers.Await(() => !(_manager.State == ScriptHostState.Running));
+            await TestHelpers.Await(() => !(_manager.State == ScriptHostState.Running), userMessage: "Expected host to not be running");
             Assert.DoesNotContain(trace.Traces, t => t.Message.StartsWith("Done"));
             Assert.Contains(trace.Traces, t => t.Message.StartsWith("Timeout value of 00:00:03 exceeded by function 'Functions.TimeoutToken' (Id: "));
             Assert.Contains(trace.Traces, t => t.Message == "A function timeout has occurred. Host is shutting down.");
@@ -43,15 +43,14 @@ public async Task OnTimeoutException_UsesToken_ManagerKeepsRunning()
 
             // wait a few seconds to make sure the manager doesn't die
             await Assert.ThrowsAsync<ApplicationException>(() => TestHelpers.Await(() => !(_manager.State == ScriptHostState.Running),
-                timeout: 3000, throwWhenDebugging: true));
+                timeout: 3000, throwWhenDebugging: true, userMessage: "Expected host manager not to die"));
             Assert.Contains(trace.Traces, t => t.Message.StartsWith("Done"));
             Assert.Contains(trace.Traces, t => t.Message.StartsWith("Timeout value of 00:00:03 exceeded by function 'Functions.TimeoutToken' (Id: "));
             Assert.DoesNotContain(trace.Traces, t => t.Message == "A function timeout has occurred. Host is shutting down.");
         }
 
         private async Task RunTimeoutExceptionTest(TraceWriter trace, bool handleCancellation)
         {
-            TimeSpan gracePeriod = TimeSpan.FromMilliseconds(5000);
             _manager = await CreateAndStartWebScriptHostManager(trace);
 
             string scenarioName = handleCancellation ? "useToken" : "ignoreToken";
@@ -80,7 +79,7 @@ private async Task<WebScriptHostManager> CreateAndStartWebScriptHostManager(Trac
             var mockEventManager = new Mock<IScriptEventManager>();
             var manager = new WebScriptHostManager(config, new TestSecretManagerFactory(), mockEventManager.Object, ScriptSettingsManager.Instance, new WebHostSettings { SecretsPath = _secretsDirectory.Path });
             Task task = Task.Run(() => { manager.RunAndBlock(); });
-            await TestHelpers.Await(() => manager.State == ScriptHostState.Running);
+            await TestHelpers.Await(() => manager.State == ScriptHostState.Running, userMessage: "Expected host to be running");
 
             return manager;
         }

test/WebJobs.Script.Tests.Shared/TestHelpers.cs

@@ -33,7 +33,7 @@ public static string FunctionsTestDirectory
             }
         }
 
-        public static async Task Await(Func<bool> condition, int timeout = 60 * 1000, int pollingInterval = 2 * 1000, bool throwWhenDebugging = false)
+        public static async Task Await(Func<bool> condition, int timeout = 60 * 1000, int pollingInterval = 2 * 1000, bool throwWhenDebugging = false, string userMessage = null)
         {
             DateTime start = DateTime.Now;
             while (!condition())
@@ -43,7 +43,12 @@ public static async Task Await(Func<bool> condition, int timeout = 60 * 1000, in
                 bool shouldThrow = !Debugger.IsAttached || (Debugger.IsAttached && throwWhenDebugging);
                 if (shouldThrow && (DateTime.Now - start).TotalMilliseconds > timeout)
                 {
-                    throw new ApplicationException("Condition not reached within timeout.");
+                    string error = "Condition not reached within timeout.";
+                    if (userMessage != null)
+                    {
+                        error += " " + userMessage;
+                    }
+                    throw new ApplicationException(error);
                 }
             }
         }