Propagate StopOnFail from config file => execution options

bradwilson · bradwilson · commit f93d52dbf743 · 2023-06-30T19:17:13.000-07:00
diff --git a/src/xunit.console/ConsoleRunner.cs b/src/xunit.console/ConsoleRunner.cs
@@ -376,11 +376,12 @@ XElement ExecuteAssembly(object consoleLock,
                 // Setup discovery and execution options with command-line overrides
                 var discoveryOptions = TestFrameworkOptions.ForDiscovery(assembly.Configuration);
                 var executionOptions = TestFrameworkOptions.ForExecution(assembly.Configuration);
-                executionOptions.SetStopOnTestFail(stopOnFail);
                 if (maxThreadCount.HasValue)
                     executionOptions.SetMaxParallelThreads(maxThreadCount);
                 if (parallelizeTestCollections.HasValue)
                     executionOptions.SetDisableParallelization(!parallelizeTestCollections.GetValueOrDefault());
+                if (stopOnFail)
+                    executionOptions.SetStopOnTestFail(stopOnFail);
 
                 var assemblyDisplayName = Path.GetFileNameWithoutExtension(assembly.AssemblyFilename);
                 var diagnosticMessageSink = DiagnosticMessageSink.ForDiagnostics(consoleLock, assemblyDisplayName, assembly.Configuration.DiagnosticMessagesOrDefault, noColor);
@@ -427,7 +428,7 @@ XElement ExecuteAssembly(object consoleLock,
                         resultsSink.Finished.WaitOne();
 
                         reporterMessageHandler.OnMessage(new TestAssemblyExecutionFinished(assembly, executionOptions, resultsSink.ExecutionSummary));
-                        if (stopOnFail && resultsSink.ExecutionSummary.Failed != 0)
+                        if (resultsSink.ExecutionSummary.Failed != 0 && executionOptions.GetStopOnTestFailOrDefault())
                         {
                             Console.WriteLine("Canceling due to test failure...");
                             cancel = true;
diff --git a/src/xunit.execution/Extensions/TestFrameworkOptionsReadExtensions.cs b/src/xunit.execution/Extensions/TestFrameworkOptionsReadExtensions.cs
@@ -167,7 +167,7 @@ public static int MaxParallelThreadsOrDefault(this ITestFrameworkExecutionOption
     }
 
     /// <summary>
-    /// Gets a flag to stop testing on test failure. If the flag is not present, returns the 
+    /// Gets a flag to stop testing on test failure. If the flag is not present, returns the
     /// default value (<c>false</c>).
     /// </summary>
     public static bool StopOnTestFailOrDefault(this ITestFrameworkExecutionOptions executionOptions)
diff --git a/src/xunit.runner.msbuild/xunit.cs b/src/xunit.runner.msbuild/xunit.cs
@@ -324,7 +324,7 @@ protected virtual XElement ExecuteAssembly(XunitProjectAssembly assembly, AppDom
                         if (resultsSink.ExecutionSummary.Failed != 0)
                         {
                             ExitCode = 1;
-                            if (stopOnFail == true)
+                            if (executionOptions.GetStopOnTestFailOrDefault())
                             {
                                 Log.LogMessage(MessageImportance.High, "Canceling due to test failure...");
                                 Cancel();
diff --git a/src/xunit.runner.utility/Extensions/TestFrameworkOptionsReadWriteExtensions.cs b/src/xunit.runner.utility/Extensions/TestFrameworkOptionsReadWriteExtensions.cs
@@ -242,6 +242,23 @@ public static int GetMaxParallelThreadsOrDefault(this ITestFrameworkExecutionOpt
         return result.GetValueOrDefault();
     }
 
+    /// <summary>
+    /// Gets a flag that determines whether xUnit.net stop testing when a test fails.
+    /// </summary>
+    public static bool? GetStopOnTestFail(this ITestFrameworkExecutionOptions executionOptions)
+    {
+        return executionOptions.GetValue<bool?>(TestOptionsNames.Execution.StopOnFail);
+    }
+
+    /// <summary>
+    /// Gets a flag that determines whether xUnit.net stop testing when a test fails. If the flag
+    /// is not set, returns the default value (<c>false</c>).
+    /// </summary>
+    public static bool GetStopOnTestFailOrDefault(this ITestFrameworkExecutionOptions executionOptions)
+    {
+        return executionOptions.GetStopOnTestFail() ?? false;
+    }
+
     /// <summary>
     /// Gets a flag that determines whether xUnit.net should report test results synchronously.
     /// </summary>
diff --git a/src/xunit.runner.utility/Frameworks/TestFrameworkOptions.cs b/src/xunit.runner.utility/Frameworks/TestFrameworkOptions.cs
@@ -1,6 +1,5 @@
 ﻿using System.Collections.Generic;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Xunit.Abstractions;
 
@@ -24,7 +23,6 @@ public class TestFrameworkOptions : ITestFrameworkDiscoveryOptions, ITestFramewo
         /// Creates an instance of <see cref="TestFrameworkOptions"/>
         /// </summary>
         /// <param name="configuration">The optional configuration to copy values from.</param>
-        [SuppressMessage("Language Usage Opportunities", "RECS0091:Use 'var' keyword when possible", Justification = "Using var here causes ambiguity with the SetDiagnosticMessages extension method")]
         public static ITestFrameworkDiscoveryOptions ForDiscovery(TestAssemblyConfiguration configuration = null)
         {
             ITestFrameworkDiscoveryOptions result = new TestFrameworkOptions();
@@ -45,7 +43,6 @@ public static ITestFrameworkDiscoveryOptions ForDiscovery(TestAssemblyConfigurat
         /// Creates an instance of <see cref="TestFrameworkOptions"/>
         /// </summary>
         /// <param name="configuration">The optional configuration to copy values from.</param>
-        [SuppressMessage("Language Usage Opportunities", "RECS0091:Use 'var' keyword when possible", Justification = "Using var here causes ambiguity with the SetDiagnosticMessages extension method")]
         public static ITestFrameworkExecutionOptions ForExecution(TestAssemblyConfiguration configuration = null)
         {
             ITestFrameworkExecutionOptions result = new TestFrameworkOptions();
@@ -56,6 +53,7 @@ public static ITestFrameworkExecutionOptions ForExecution(TestAssemblyConfigurat
                 result.SetInternalDiagnosticMessages(configuration.InternalDiagnosticMessages);
                 result.SetDisableParallelization(!configuration.ParallelizeTestCollections);
                 result.SetMaxParallelThreads(configuration.MaxParallelThreads);
+                result.SetStopOnTestFail(configuration.StopOnFail);
             }
 
             return result;

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public static int MaxParallelThreadsOrDefault(this ITestFrameworkExecutionOption`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`/// <summary>`
`170`		`- /// Gets a flag to stop testing on test failure. If the flag is not present, returns the`
	`170`	`+ /// Gets a flag to stop testing on test failure. If the flag is not present, returns the`
`171`	`171`	`/// default value (<c>false</c>).`
`172`	`172`	`/// </summary>`
`173`	`173`	`public static bool StopOnTestFailOrDefault(this ITestFrameworkExecutionOptions executionOptions)`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ protected virtual XElement ExecuteAssembly(XunitProjectAssembly assembly, AppDom`
`324`	`324`	`if (resultsSink.ExecutionSummary.Failed != 0)`
`325`	`325`	`{`
`326`	`326`	`ExitCode = 1;`
`327`		`- if (stopOnFail == true)`
	`327`	`+ if (executionOptions.GetStopOnTestFailOrDefault())`
`328`	`328`	`{`
`329`	`329`	`Log.LogMessage(MessageImportance.High, "Canceling due to test failure...");`
`330`	`330`	`Cancel();`