From ba75eb417fd06eb988a33324496d11a1859478e1 Mon Sep 17 00:00:00 2001
From: Tom Longhurst <30480171+thomhurst@users.noreply.github.com>
Date: Thu, 5 Nov 2026 01:08:06 +0000
Subject: [PATCH 1/2] Avoid certificate trust preparation for HTTP-only Aspire
 test resources (#7616)

---
 tests/TUnit.Aspire.Tests.AppHost/Program.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/TUnit.Aspire.Tests.AppHost/Program.cs b/tests/TUnit.Aspire.Tests.AppHost/Program.cs
index cf7b5db2c48..978c066f35e 100644
--- a/tests/TUnit.Aspire.Tests.AppHost/Program.cs
+++ b/tests/TUnit.Aspire.Tests.AppHost/Program.cs
@@ -1,8 +1,14 @@
+using Aspire.Hosting.ApplicationModel;
+
 var builder = DistributedApplication.CreateBuilder(args);
 
 builder.AddParameter("my-secret", secret: true);
-builder.AddContainer("nginx-no-healthcheck", "nginx");
+// These resources only serve HTTP and export telemetry over HTTP. They do not need
+// Aspire to prepare custom CA trust bundles before DCP can start them (#7616).
+builder.AddContainer("nginx-no-healthcheck", "nginx")
+    .WithCertificateTrustScope(CertificateTrustScope.None);
 builder.AddProject<Projects.TUnit_Aspire_Tests_ApiService>("api-service")
-    .WithHttpEndpoint(targetPort: 8080);
+    .WithHttpEndpoint(targetPort: 8080)
+    .WithCertificateTrustScope(CertificateTrustScope.None);
 
 builder.Build().Run();

From 4915a0e8761334546b77ff807ccccc34b22dd568 Mon Sep 17 00:00:00 2001
From: Tom Longhurst <30480171+thomhurst@users.noreply.github.com>
Date: Thu, 5 Nov 2026 02:12:15 +0000
Subject: [PATCH 2/2] Capture child process exit diagnostics for #7607

---
 tests/TUnit.Engine.Tests/InvokableTestBase.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/TUnit.Engine.Tests/InvokableTestBase.cs b/tests/TUnit.Engine.Tests/InvokableTestBase.cs
index eda2f5e9e72..61020297457 100644
--- a/tests/TUnit.Engine.Tests/InvokableTestBase.cs
+++ b/tests/TUnit.Engine.Tests/InvokableTestBase.cs
@@ -189,11 +189,14 @@ private async Task<CommandTask<BufferedCommandResult>> RunWithFailureLogging(Com
 
                                  $@"Mode: {testMode}",
                                  @$"Command Input: {command}",
+                                 @$"Process ID: {commandTask.ProcessId}",
+                                 @$"Exit Code: {commandResult?.ExitCode.ToString(System.Globalization.CultureInfo.InvariantCulture) ?? "unavailable"}",
+                                 @$"Expected TRX: {trxPath}",
                                  @$"Error: {commandResult?.StandardError}",
                                  @$"Output: {commandResult?.StandardOutput}"
 
                                  Expression: {assertionExpression}
-                                 """);
+                                 """, e);
         }
 
         return commandTask;