Ensure that FileTraceWriter applies TraceLevel

Author: mathewc

src/WebJobs.Script/Diagnostics/FileTraceWriter.cs

@@ -130,7 +130,13 @@ public override void Trace(TraceEvent traceEvent)
                 throw new ArgumentNullException("traceEvent");
             }
 
+            if (Level < traceEvent.Level)
+            {
+                return;
+            }
+
             AppendLine(traceEvent.Message);
+
             if (traceEvent.Exception != null)
             {
                 if (traceEvent.Exception is FunctionInvocationException ||

test/WebJobs.Script.Tests/FileTraceWriterTests.cs

@@ -140,6 +140,32 @@ public void WriteLogs_ReusesLastFile()
             Assert.Equal(3, fileLines.Length);
         }
 
+        [Fact]
+        public void Trace_AppliesLevelFilter()
+        {
+            DirectoryInfo directory = new DirectoryInfo(_logFilePath);
+            directory.Create();
+
+            int count = directory.EnumerateFiles().Count();
+            Assert.Equal(0, count);
+
+            FileTraceWriter traceWriter = new FileTraceWriter(_logFilePath, TraceLevel.Info);
+
+            traceWriter.Verbose("Test Verbose");
+            traceWriter.Info("Test Info");
+            traceWriter.Warning("Test Warning");
+            traceWriter.Error("Test Error");
+
+            traceWriter.Flush();
+
+            string logFile = directory.EnumerateFiles().First().FullName;
+            string text = File.ReadAllText(logFile);
+            Assert.True(text.Contains("Test Error"));
+            Assert.True(text.Contains("Test Warning"));
+            Assert.True(text.Contains("Test Info"));
+            Assert.False(text.Contains("Test Verbose"));
+        }
+
         private void WriteLogs(string logFilePath, int numLogs)
         {
             FileTraceWriter traceWriter = new FileTraceWriter(logFilePath, TraceLevel.Verbose);

test/WebJobs.Script.Tests/PowerShellEndToEndTests.cs

@@ -71,9 +71,6 @@ public async Task HttpTriggerWithError_Get()
             string functionName = "HttpTrigger-PowerShellWithError";
             TestHelpers.ClearFunctionLogs(functionName);
 
-            string innerException = "PowerShell script error";
-            string errorRecordMessage = "Test Error in Get-DateToday";
-            string expectedModuleRelativePath = string.Format("/{0}/modules/Get-DateToday.psm1", functionName);
             HttpRequestMessage request = new HttpRequestMessage
             {
                 RequestUri =
@@ -87,6 +84,8 @@ public async Task HttpTriggerWithError_Get()
                 { "req", request }
             };
 
+            string innerException = "PowerShell script error";
+            string errorRecordMessage = "Test Error in Get-DateToday";
             Exception ex = await
                 Assert.ThrowsAsync<FunctionInvocationException>(async () => await Fixture.Host.CallAsync(functionName, arguments));
             var runtimeException = (RuntimeException)ex.InnerException;
@@ -96,10 +95,6 @@ public async Task HttpTriggerWithError_Get()
             var logs = await TestHelpers.GetFunctionLogsAsync(functionName);
             Assert.True(logs.Any(p => p.Contains("Function started")));
 
-            // verify module was loaded
-            Assert.True(logs.Any(p => p.Contains("Loaded modules:")));
-            Assert.True(logs.Any(p => p.IndexOf(expectedModuleRelativePath, StringComparison.OrdinalIgnoreCase) >= 0));
-
             // verify an error was written
             Assert.True(logs.Any(p => p.Contains(errorRecordMessage)));