Skip to content

Commit 45eb783

Browse files
committed
Pull in output printing bug fix from core
1 parent e205244 commit 45eb783

File tree

4 files changed

+5
-17
lines changed

4 files changed

+5
-17
lines changed

Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<NSubstituteVersion>5.1.0</NSubstituteVersion>
1010
<TunnelVisionLabsReferenceAssemblyAnnotatorVersion>1.0.0-alpha.160</TunnelVisionLabsReferenceAssemblyAnnotatorVersion>
1111
<XunitAnalyzersVersion>1.14.0-pre.3</XunitAnalyzersVersion>
12-
<XunitVersion>2.8.1-pre.10</XunitVersion>
12+
<XunitVersion>2.8.1-pre.11</XunitVersion>
1313
</PropertyGroup>
1414

1515
</Project>

src/xunit.runner.visualstudio/Sinks/VsExecutionSink.cs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ public VsExecutionSink(
2222
ITestExecutionRecorder recorder,
2323
LoggerHelper logger,
2424
Dictionary<string, TestCase> testCasesMap,
25-
Func<bool> cancelledThunk,
26-
bool showLiveOutput)
25+
Func<bool> cancelledThunk)
2726
{
2827
this.innerSink = innerSink;
2928
this.recorder = recorder;
@@ -46,9 +45,6 @@ public VsExecutionSink(
4645
Execution.TestMethodCleanupFailureEvent += HandleTestMethodCleanupFailure;
4746
Execution.TestPassedEvent += HandleTestPassed;
4847
Execution.TestSkippedEvent += HandleTestSkipped;
49-
50-
if (showLiveOutput)
51-
Execution.TestOutputEvent += HandleTestOutput;
5248
}
5349

5450
public ExecutionSummary ExecutionSummary { get; private set; }
@@ -131,12 +127,6 @@ void HandleTestFailed(MessageHandlerArgs<ITestFailed> args)
131127
HandleCancellation(args);
132128
}
133129

134-
void HandleTestOutput(MessageHandlerArgs<ITestOutput> args)
135-
{
136-
var testOutput = args.Message;
137-
logger.Log(" {0} [OUTPUT] {1}", testOutput.Test.DisplayName, testOutput.Output.TrimEnd());
138-
}
139-
140130
void HandleTestPassed(MessageHandlerArgs<ITestPassed> args)
141131
{
142132
var testPassed = args.Message;

src/xunit.runner.visualstudio/VsTestRunner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ void RunTestsInAssembly(
543543

544544
reporterMessageHandler.OnMessage(new TestAssemblyExecutionStarting(runInfo.Assembly, executionOptions));
545545

546-
using var vsExecutionSink = new VsExecutionSink(reporterMessageHandler, frameworkHandle, logger, testCasesMap, () => cancelled, executionOptions.GetShowLiveOutputOrDefault());
546+
using var vsExecutionSink = new VsExecutionSink(reporterMessageHandler, frameworkHandle, logger, testCasesMap, () => cancelled);
547547
var executionSinkOptions = new ExecutionSinkOptions
548548
{
549549
DiagnosticMessageSink = diagnosticsSinkRemote,

test/xunit.runner.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"$schema": "https://xunit.net/schema/v2.5/xunit.runner.schema.json",
3-
"diagnosticMessages": true,
4-
"methodDisplay": "classAndMethod",
5-
"parallelizeAssembly": true
2+
"$schema": "https://xunit.net/schema/v2.8.1/xunit.runner.schema.json",
3+
"diagnosticMessages": true
64
}

0 commit comments

Comments
 (0)