xunit/visualstudio.xunit#392: stopOnFail is ignored when synchronous …

…message reporting is requested

src/xunit.v3.core.tests/Internal/SynchronousMessageBusTests.cs

@@ -25,4 +25,28 @@ public void BusShouldReportShutdownWhenMessageSinkReturnsFalse()
 
 		Assert.False(bus.QueueMessage(new _MessageSinkMessage()));
 	}
+
+	[Fact]
+	public void WhenStopOnFailIsFalse_WithFailedTest_BusShouldNotReportShutdown()
+	{
+		var testPassedMessage = TestData.TestPassed();
+		var testFailedMessage = TestData.TestFailed();
+		using var bus = new SynchronousMessageBus(SpyMessageSink.Create(), stopOnFail: false);
+
+		Assert.True(bus.QueueMessage(testPassedMessage));
+		Assert.True(bus.QueueMessage(testFailedMessage));
+		Assert.True(bus.QueueMessage(testPassedMessage));
+	}
+
+	[Fact]
+	public void WhenStopOnFailIsTrue_WithFailedTest_BusShouldReportShutdown()
+	{
+		var testPassedMessage = TestData.TestPassed();
+		var testFailedMessage = TestData.TestFailed();
+		using var bus = new SynchronousMessageBus(SpyMessageSink.Create(), stopOnFail: true);
+
+		Assert.True(bus.QueueMessage(testPassedMessage));
+		Assert.False(bus.QueueMessage(testFailedMessage));
+		Assert.False(bus.QueueMessage(testPassedMessage));
+	}
 }

src/xunit.v3.core/Internal/SynchronousMessageBus.cs

@@ -9,12 +9,17 @@ namespace Xunit.Internal;
 /// </summary>
 public class SynchronousMessageBus : IMessageBus
 {
+	volatile bool continueRunning = true;
 	readonly _IMessageSink messageSink;
+	readonly bool stopOnFail;
 
 	/// <summary/>
-	public SynchronousMessageBus(_IMessageSink messageSink)
+	public SynchronousMessageBus(
+		_IMessageSink messageSink,
+		bool stopOnFail = false)
 	{
 		this.messageSink = Guard.ArgumentNotNull(messageSink);
+		this.stopOnFail = stopOnFail;
 	}
 
 	/// <summary/>
@@ -28,6 +33,9 @@ public bool QueueMessage(_MessageSinkMessage message)
 	{
 		Guard.ArgumentNotNull(message);
 
-		return messageSink.OnMessage(message);
+		if (stopOnFail && message is _TestFailed)
+			continueRunning = false;
+
+		return messageSink.OnMessage(message) && continueRunning;
 	}
 }

src/xunit.v3.core/Sdk/v3/Runners/TestAssemblyRunnerContext.cs

@@ -112,7 +112,7 @@ public abstract class TestAssemblyRunnerContext<TTestCase> : IAsyncLifetime
 	protected virtual IMessageBus CreateMessageBus()
 	{
 		if (ExecutionOptions.SynchronousMessageReportingOrDefault())
-			return new SynchronousMessageBus(ExecutionMessageSink);
+			return new SynchronousMessageBus(ExecutionMessageSink, ExecutionOptions.StopOnTestFailOrDefault());
 
 		return new MessageBus(ExecutionMessageSink, ExecutionOptions.StopOnTestFailOrDefault());
 	}