Restore the Func<TestOutputHelper> so we re-create the output helper for each test

bradwilson · bradwilson · commit 27c70a789676 · 2024-06-16T16:11:24.000-07:00
diff --git a/src/xunit.execution/Sdk/Frameworks/Runners/XunitTestRunner.cs b/src/xunit.execution/Sdk/Frameworks/Runners/XunitTestRunner.cs
@@ -54,9 +54,11 @@ protected override async Task<Tuple<decimal, string>> InvokeTestAsync(ExceptionA
             var output = string.Empty;
 
             TestOutputHelper testOutputHelper = null;
+            int testOutputHelperIdx = -1;
             for (int idx = 0; idx < ConstructorArguments.Length; ++idx)
                 if (ConstructorArguments[idx] is Func<TestOutputHelper>)
                 {
+                    testOutputHelperIdx = idx;
                     testOutputHelper = new TestOutputHelper();
                     ConstructorArguments[idx] = testOutputHelper;
                     break;
@@ -71,6 +73,7 @@ protected override async Task<Tuple<decimal, string>> InvokeTestAsync(ExceptionA
             {
                 output = testOutputHelper.Output;
                 testOutputHelper.Uninitialize();
+                ConstructorArguments[testOutputHelperIdx] = () => new TestOutputHelper();
             }
 
             return Tuple.Create(executionTime, output);

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,11 @@ protected override async Task<Tuple<decimal, string>> InvokeTestAsync(ExceptionA`
`54`	`54`	`var output = string.Empty;`
`55`	`55`
`56`	`56`	`TestOutputHelper testOutputHelper = null;`
	`57`	`+ int testOutputHelperIdx = -1;`
`57`	`58`	`for (int idx = 0; idx < ConstructorArguments.Length; ++idx)`
`58`	`59`	`if (ConstructorArguments[idx] is Func<TestOutputHelper>)`
`59`	`60`	`{`
	`61`	`+ testOutputHelperIdx = idx;`
`60`	`62`	`testOutputHelper = new TestOutputHelper();`
`61`	`63`	`ConstructorArguments[idx] = testOutputHelper;`
`62`	`64`	`break;`
`@@ -71,6 +73,7 @@ protected override async Task<Tuple<decimal, string>> InvokeTestAsync(ExceptionA`
`71`	`73`	`{`
`72`	`74`	`output = testOutputHelper.Output;`
`73`	`75`	`testOutputHelper.Uninitialize();`
	`76`	`+ ConstructorArguments[testOutputHelperIdx] = () => new TestOutputHelper();`
`74`	`77`	`}`
`75`	`78`
`76`	`79`	`return Tuple.Create(executionTime, output);`