Moving to EventGrid extension version 1.0.0 + fix flaky test

mathewc · mathewc · commit 5f77d0a88e4d · 2018-07-13T09:28:20.000-07:00
diff --git a/src/WebJobs.Script.Host/WebJobs.Script.Host.csproj b/src/WebJobs.Script.Host/WebJobs.Script.Host.csproj
@@ -120,7 +120,7 @@
       <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.3.0-beta1-10632\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0-10036\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.MobileApps, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.3.0-beta1-10623\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
diff --git a/src/WebJobs.Script.Host/packages.config b/src/WebJobs.Script.Host/packages.config
@@ -23,7 +23,7 @@
   <package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta9-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.3.0-beta1-10632" targetFramework="net471" />
-  <package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0-10036" targetFramework="net471" />
+  <package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.3.0-beta1-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.3.0-beta1-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.3.0-beta1-10623" targetFramework="net471" />
diff --git a/src/WebJobs.Script.NuGet/WebJobs.Script.nuspec b/src/WebJobs.Script.NuGet/WebJobs.Script.nuspec
@@ -29,7 +29,7 @@
       <dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.3.0-beta1-10623" />
       <dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.3.0-beta1-10623" />
       <dependency id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.3.0-beta1-10623" />
-      <dependency id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0-10036" />
+      <dependency id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0" />
       <dependency id="Microsoft.Bot.Connector.DirectLine" version="3.0.0-beta" />
       <dependency id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" />
       <dependency id="Microsoft.CodeAnalysis.CSharp.Scripting" version="2.3.2" />
diff --git a/src/WebJobs.Script.NuGet/packages.config b/src/WebJobs.Script.NuGet/packages.config
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-This is required to live alongside WebJobs.EasyTables.nuproj. If it is not here
-the build will fail due to Bcl.Build missing some required packages.
--->
 <packages>
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
diff --git a/src/WebJobs.Script.WebHost.NuGet/packages.config b/src/WebJobs.Script.WebHost.NuGet/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
+</packages>
diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
@@ -193,7 +193,7 @@
       <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.3.0-beta1-10632\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0-10036\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.Http, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Http.1.2.0-beta1-10623\lib\net45\Microsoft.Azure.WebJobs.Extensions.Http.dll</HintPath>
diff --git a/src/WebJobs.Script.WebHost/packages.config b/src/WebJobs.Script.WebHost/packages.config
@@ -51,7 +51,7 @@
   <package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta9-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.3.0-beta1-10632" targetFramework="net471" />
-  <package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0-10036" targetFramework="net471" />
+  <package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.2.0-beta1-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.3.0-beta1-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.3.0-beta1-10623" targetFramework="net471" />
diff --git a/src/WebJobs.Script/Host/ScriptHost.cs b/src/WebJobs.Script/Host/ScriptHost.cs
@@ -1550,10 +1550,6 @@ internal static void ApplyConfiguration(JObject config, ScriptHostConfiguration
                     scriptConfig.Functions.Add((string)function);
                 }
             }
-            else
-            {
-                scriptConfig.Functions = null;
-            }
 
             // We may already have a host id, but the one from the JSON takes precedence
             JToken hostId = (JToken)config["id"];
diff --git a/src/WebJobs.Script/WebJobs.Script.csproj b/src/WebJobs.Script/WebJobs.Script.csproj
@@ -126,7 +126,7 @@
       <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.3.0-beta1-10632\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0-10036\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.Http, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Http.1.2.0-beta1-10623\lib\net45\Microsoft.Azure.WebJobs.Extensions.Http.dll</HintPath>
diff --git a/src/WebJobs.Script/packages.config b/src/WebJobs.Script/packages.config
@@ -27,7 +27,7 @@
   <package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta9-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.3.0-beta1-10632" targetFramework="net471" />
-  <package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0-10036" targetFramework="net471" />
+  <package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.2.0-beta1-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.3.0-beta1-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.3.0-beta1-10623" targetFramework="net471" />
diff --git a/test/WebJobs.Script.Tests.Integration/EndToEndTimeoutTests.cs b/test/WebJobs.Script.Tests.Integration/EndToEndTimeoutTests.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Runtime.ExceptionServices;
 using System.Threading;
@@ -116,27 +115,23 @@ private async Task RunTimeoutTest(string scriptLang, string functionName)
             TestHelpers.ClearFunctionLogs(functionName);
             TimeSpan testTimeout = TimeSpan.FromSeconds(3);
             var traceWriter = new TestTraceWriter(TraceLevel.Verbose);
+
             using (var manager = await CreateAndStartScriptHostManager(scriptLang, functionName, testTimeout, traceWriter))
             {
                 string testData = Guid.NewGuid().ToString();
-
-                Dictionary<string, object> arguments = new Dictionary<string, object>
+                var arguments = new Dictionary<string, object>
                 {
                     { "inputData", testData },
                 };
-
-                FunctionTimeoutException ex = await Assert.ThrowsAsync<FunctionTimeoutException>(() => manager.Instance.CallAsync(functionName, arguments));
+                var timeoutException = await Assert.ThrowsAsync<FunctionTimeoutException>(() => manager.Instance.CallAsync(functionName, arguments));
 
                 await TestHelpers.Await(() =>
                 {
-                    // make sure logging from within the function worked
-                    // TODO: This doesn't appear to work for Powershell in AppVeyor. Need to investigate.
-                    // bool hasTestData = inProgressLogs.Any(l => l.Contains(testData));
-                    var expectedMessage = $"Timeout value of {testTimeout} was exceeded by function: Functions.{functionName}";
-                    var traces = string.Join(Environment.NewLine, traceWriter.GetTraces());
-                    return traces.Contains(expectedMessage);
+                    // wait for the timeout exception to be logged
+                    return traceWriter.GetTraces().Any(p => p.Message == $"Microsoft.Azure.WebJobs.Host: Timeout value of {testTimeout} was exceeded by function: Functions.{functionName}.");
                 });
 
+                // verify that our mock handler received the timeout exception
                 var exception = GetExceptionHandler(manager).TimeoutExceptionInfos.Single().SourceException;
                 Assert.IsType<FunctionTimeoutException>(exception);
             }
@@ -149,6 +144,7 @@ private MockExceptionHandler GetExceptionHandler(ScriptHostManager manager)
 
         private async Task<MockScriptHostManager> CreateAndStartScriptHostManager(string scriptLang, string functionName, TimeSpan timeout, TraceWriter traceWriter)
         {
+            // filter down to a single function
             var functions = new Collection<string>();
             functions.Add(functionName);
 
diff --git a/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj b/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj
@@ -142,7 +142,7 @@
       <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.3.0-beta1-10632\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0-10036\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.Http, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Http.1.2.0-beta1-10623\lib\net45\Microsoft.Azure.WebJobs.Extensions.Http.dll</HintPath>
diff --git a/test/WebJobs.Script.Tests.Integration/packages.config b/test/WebJobs.Script.Tests.Integration/packages.config
@@ -35,7 +35,7 @@
   <package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta9-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.3.0-beta1-10632" targetFramework="net471" />
-  <package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0-10036" targetFramework="net471" />
+  <package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.2.0-beta1-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.3.0-beta1-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.3.0-beta1-10623" targetFramework="net471" />
diff --git a/test/WebJobs.Script.Tests/ScriptHostTests.cs b/test/WebJobs.Script.Tests/ScriptHostTests.cs
@@ -779,26 +779,31 @@ public void ApplyConfiguration_AllowPartialHostStartup()
         }
 
         [Fact]
-        public void ApplyConfiguration_AppliesFunctionsFilter()
+        public void ApplyConfiguration_FunctionsFilterPrecedence()
         {
+            // ensure that if no json config specified, imperative config wins
             JObject config = new JObject();
-            config["id"] = ID;
-
-            ScriptHostConfiguration scriptConfig = new ScriptHostConfiguration();
-            Assert.Null(scriptConfig.Functions);
-
-            config["functions"] = new JArray("Function1", "Function2");
+            var functions = new Collection<string>
+            {
+                "Foo",
+                "Bar"
+            };
+            var scriptConfig = new ScriptHostConfiguration
+            {
+                Functions = functions
+            };
+            ScriptHost.ApplyConfiguration(config, scriptConfig);
+            Assert.Same(functions, scriptConfig.Functions);
 
+            // json config takes precedence over imperative config
+            config["functions"] = new JArray("Baz");
             ScriptHost.ApplyConfiguration(config, scriptConfig);
-            Assert.Equal(2, scriptConfig.Functions.Count);
-            Assert.Equal("Function1", scriptConfig.Functions.ElementAt(0));
-            Assert.Equal("Function2", scriptConfig.Functions.ElementAt(1));
+            Assert.Equal("Baz", scriptConfig.Functions.Single());
         }
 
         [Fact]
-        public void ApplyConfiguration_ClearsFunctionsFilter()
+        public void ApplyConfiguration_AppliesFunctionsFilter()
         {
-            // A previous bug wouldn't properly clear the filter if you removed it.
             JObject config = new JObject();
             config["id"] = ID;
 
@@ -811,12 +816,6 @@ public void ApplyConfiguration_ClearsFunctionsFilter()
             Assert.Equal(2, scriptConfig.Functions.Count);
             Assert.Equal("Function1", scriptConfig.Functions.ElementAt(0));
             Assert.Equal("Function2", scriptConfig.Functions.ElementAt(1));
-
-            config.Remove("functions");
-
-            ScriptHost.ApplyConfiguration(config, scriptConfig);
-
-            Assert.Null(scriptConfig.Functions);
         }
 
         [Fact]
diff --git a/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj b/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj
@@ -148,7 +148,7 @@
       <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.3.0-beta1-10632\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0-10036\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.WebJobs.Extensions.Http, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Http.1.2.0-beta1-10623\lib\net45\Microsoft.Azure.WebJobs.Extensions.Http.dll</HintPath>
diff --git a/test/WebJobs.Script.Tests/packages.config b/test/WebJobs.Script.Tests/packages.config
@@ -36,7 +36,7 @@
   <package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta9-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.3.0-beta1-10632" targetFramework="net471" />
-  <package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0-10036" targetFramework="net471" />
+  <package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.2.0-beta1-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.3.0-beta1-10623" targetFramework="net471" />
   <package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.3.0-beta1-10623" targetFramework="net471" />

Original file line number	Diff line number	Diff line change
`@@ -1550,10 +1550,6 @@ internal static void ApplyConfiguration(JObject config, ScriptHostConfiguration`
`1550`	`1550`	`scriptConfig.Functions.Add((string)function);`
`1551`	`1551`	`}`
`1552`	`1552`	`}`
`1553`		`- else`
`1554`		`- {`
`1555`		`- scriptConfig.Functions = null;`
`1556`		`- }`
`1557`	`1553`
`1558`	`1554`	`// We may already have a host id, but the one from the JSON takes precedence`
`1559`	`1555`	`JToken hostId = (JToken)config["id"];`