Fixing tests leaking host

Author: mathewc

test/WebJobs.Script.Tests/FunctionDescriptorProviderTests.cs

@@ -12,9 +12,10 @@
 
 namespace Microsoft.Azure.WebJobs.Script.Tests
 {
-    public class FunctionDescriptorProviderTests
+    public class FunctionDescriptorProviderTests : IDisposable
     {
         private readonly FunctionDescriptorProvider _provider;
+        private readonly ScriptHost _host;
 
         public FunctionDescriptorProviderTests()
         {
@@ -23,8 +24,9 @@ public FunctionDescriptorProviderTests()
             {
                 RootScriptPath = rootPath
             };
-            ScriptHost host = ScriptHost.Create(config);
-            _provider = new TestDescriptorProvider(host, config);
+
+            _host = ScriptHost.Create(config);
+            _provider = new TestDescriptorProvider(_host, config);
         }
 
         [Fact]
@@ -89,6 +91,19 @@ public void ValidateBinding_EmptyName_Throws(string bindingName)
             Assert.Equal("A valid name must be assigned to the binding.", ex.Message);
         }
 
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _host?.Dispose();
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+        }
+
         private class TestDescriptorProvider : FunctionDescriptorProvider
         {
             public TestDescriptorProvider(ScriptHost host, ScriptHostConfiguration config) : base(host, config)

test/WebJobs.Script.Tests/NodeFunctionGenerationTests.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -192,13 +193,18 @@ private static MethodInfo GenerateMethod(BindingMetadata trigger)
             {
                 RootScriptPath = rootPath
             };
-            ScriptHost host = ScriptHost.Create(scriptConfig);
-            FunctionDescriptorProvider[] descriptorProviders = new FunctionDescriptorProvider[]
+
+            Collection<FunctionDescriptor> functionDescriptors = null;
+            using (ScriptHost host = ScriptHost.Create(scriptConfig))
             {
+                FunctionDescriptorProvider[] descriptorProviders = new FunctionDescriptorProvider[]
+                {
                 new NodeFunctionDescriptorProvider(host, scriptConfig)
-            };
+                };
+
+                functionDescriptors = host.ReadFunctions(metadatas, descriptorProviders);
+            }
 
-            var functionDescriptors = host.ReadFunctions(metadatas, descriptorProviders);
             Type t = FunctionGenerator.Generate("TestScriptHost", "Host.Functions", functionDescriptors);
 
             MethodInfo method = t.GetMethods(BindingFlags.Public | BindingFlags.Static).First();

test/WebJobs.Script.Tests/TestScripts/PowerShellFunctionGenerationTests.cs

@@ -30,9 +30,9 @@ public void GenerateHttpTriggerFunction()
                 Type = "HttpTrigger",
                 Name = inputBindingName
             };
-            var scriptHostInfo = GetScriptHostInfo();
-            MethodInfo method = GenerateMethod(trigger, scriptHostInfo);
 
+            MethodInfo method = GenerateMethod(trigger);
+           
             VerifyCommonProperties(method);
 
             // verify trigger parameter
@@ -54,8 +54,8 @@ public void GenerateQueueTriggerFunction()
                 { "direction", "in" },
                 { "queueName", "test" }
             });
-            var scriptHostInfo = GetScriptHostInfo();
-            MethodInfo method = GenerateMethod(trigger, scriptHostInfo);
+
+            MethodInfo method = GenerateMethod(trigger);
 
             VerifyCommonProperties(method);
 
@@ -86,12 +86,14 @@ public void GenerateQueueTriggerFunction_WithInvalidInputName_Fails()
                 { "QueueName", "test" }
             };
 
-            var scriptHostInfo = GetScriptHostInfo();
-            Exception ex = Assert.Throws<InvalidOperationException>(() => GenerateMethod(trigger, scriptHostInfo));
-            Assert.Equal("Sequence contains no elements", ex.Message);
-            
-            var functionError = scriptHostInfo.Host.FunctionErrors[FunctionName];
-            Assert.True(functionError.Contains(expectedError));
+            using (var scriptHostInfo = GetScriptHostInfo())
+            {
+                Exception ex = Assert.Throws<InvalidOperationException>(() => GenerateMethod(trigger, scriptHostInfo));
+                Assert.Equal("Sequence contains no elements", ex.Message);
+
+                var functionError = scriptHostInfo.Host.FunctionErrors[FunctionName];
+                Assert.True(functionError.Contains(expectedError));
+            }
         }
 
         private static void VerifyCommonProperties(MethodInfo method)
@@ -117,6 +119,14 @@ private static void VerifyCommonProperties(MethodInfo method)
             Assert.Equal(typeof(ExecutionContext), parameter.ParameterType);
         }
 
+        private static MethodInfo GenerateMethod(BindingMetadata trigger)
+        {
+            using (var scriptHostInfo = GetScriptHostInfo())
+            {
+                return GenerateMethod(trigger, scriptHostInfo);
+            }
+        }
+
         private static MethodInfo GenerateMethod(BindingMetadata trigger, ScriptHostInfo scriptHostInfo)
         {
             FunctionMetadata metadata = new FunctionMetadata();
@@ -146,18 +156,38 @@ private static ScriptHostInfo GetScriptHostInfo()
             {
                 RootScriptPath = rootPath
             };
-            ScriptHost host = ScriptHost.Create(scriptConfig);
-            return new ScriptHostInfo { Host = host, Configuration = scriptConfig, RootPath = rootPath };
+            var host = ScriptHost.Create(scriptConfig);
+            return new ScriptHostInfo(host, scriptConfig, rootPath);
         }
     }
 
     [SuppressMessage("Microsoft.StyleCop.CSharp.MaintainabilityRules", "SA1402:FileMayOnlyContainASingleClass")]
-    internal class ScriptHostInfo
+    internal class ScriptHostInfo : IDisposable
     {
-        public ScriptHost Host { get; set; }
+        public ScriptHostInfo(ScriptHost host, ScriptHostConfiguration config, string rootPath)
+        {
+            Host = host;
+            Configuration = config;
+            RootPath = rootPath;
+        }
 
-        public ScriptHostConfiguration Configuration { get; set; }
+        public ScriptHost Host { get; }
 
-        public string RootPath { get; set; }
+        public ScriptHostConfiguration Configuration { get; }
+
+        public string RootPath { get; }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                Host.Dispose();
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+        }
     }
 }