.

source/Octopus.Tentacle.Tests.Integration/TentacleCommandLineTests.cs

@@ -155,8 +155,7 @@ to text.
 
 Or one of the common options: 
 
-      --help                 Show detailed help for this command
-");
+      --help                 Show detailed help for this command");
         }
 
         [Test]
@@ -176,8 +175,7 @@ to text.
 
 Or one of the common options: 
 
-      --help                 Show detailed help for this command
-");
+      --help                 Show detailed help for this command");
         }
 
         [Test]
@@ -510,8 +508,7 @@ to text.
 
 Or one of the common options: 
 
-      --help                 Show detailed help for this command
-");
+      --help                 Show detailed help for this command");
         }
 
         [Test]
@@ -616,8 +613,7 @@ public async Task ShowConfigurationCommandLooksSensibleToHumans(TentacleConfigur
       ""PortNumber"": 10933
     }}
   }}
-}}
-");
+}}");
             }
             else
             {
@@ -655,8 +651,7 @@ public async Task ShowConfigurationCommandLooksSensibleToHumans(TentacleConfigur
       ""PortNumber"": {clientAndTentacle.RunningTentacle.ServiceUri.Port}
     }}
   }}
-}}
-");
+}}");
             }
 
             await Task.CompletedTask;
@@ -742,7 +737,34 @@ FileVersionInfo GetVersionInfo(TentacleConfigurationTestCase tentacleConfigurati
                     .WithEnvironmentVariables(environmentVariablesToRunTentacleWith)
                     .ExecuteAsync(CancellationToken));
 
-            return (result.ExitCode, output.ToString(), errorOut.ToString());
+            var allOutput = output.ToString();
+            var filteredOutput = new StringBuilder();
+
+            // We turn on TRACE logging for Tentacle so we can capture the verbose output for debugging. 
+            // This interferes with these tests so we need to do a bit of filtering of the output.
+            foreach (var line in allOutput.Split(Environment.NewLine))
+            {
+                if (!line.StartsWith("[TRACE]") && !line.StartsWith("[DEBUG]"))
+                {
+                    if (line.StartsWith("}["))
+                    {
+                        filteredOutput.AppendLine("}");
+                    }
+                    else if (line.StartsWith("["))
+                    {
+                        filteredOutput.AppendLine(line.Substring(8));
+                    }
+                    else
+                    {
+                        filteredOutput.AppendLine(line);
+                    }
+                }
+            }
+
+            var filteredOutputString = filteredOutput.ToString();
+            filteredOutputString = filteredOutputString.TrimEnd(' ', '\r', '\n', ' ', '\r', '\n', ' ');
+
+            return (result.ExitCode, filteredOutputString, errorOut.ToString());
         }
 
         static string JsonFormattedPath(string path)

source/Octopus.Tentacle.Tests.Integration/Util/SerilogLoggerBuilder.cs

@@ -151,7 +151,7 @@ public void Emit(LogEvent logEvent)
                 var testName = TestContext.CurrentContext.Test.FullName;
 
                 if (!TraceLoggers.TryGetValue(testName, out var traceLogger))
-                    throw new Exception($"Could not find trace logger for test '{testName}'");
+                    return;
 
                 var output = new StringWriter();
                 if (logEvent.Properties.TryGetValue("SourceContext", out var sourceContext))