From 60dc7a539f1c83e39eff4ad75de2a1096c2e3162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Fri, 6 Sep 2024 14:19:04 +0200 Subject: [PATCH] [rel/3.6] Fix timedout test does not fail test run (in ui) (#3774) --- .../OutputDevice/Terminal/TerminalTestReporter.cs | 15 +++------------ .../OutputDevice/Terminal/TestProgressState.cs | 4 ---- .../Terminal/TerminalTestReporterTests.cs | 3 ++- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TerminalTestReporter.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TerminalTestReporter.cs index 3d5e45c7ae..6076758537 100644 --- a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TerminalTestReporter.cs +++ b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TerminalTestReporter.cs @@ -382,9 +382,8 @@ internal void TestCompleted( switch (outcome) { case TestOutcome.Error: - asm.FailedTests++; - asm.TotalTests++; - break; + case TestOutcome.Timeout: + case TestOutcome.Canceled: case TestOutcome.Fail: asm.FailedTests++; asm.TotalTests++; @@ -397,14 +396,6 @@ internal void TestCompleted( asm.SkippedTests++; asm.TotalTests++; break; - case TestOutcome.Timeout: - asm.TimedOutTests++; - asm.TotalTests++; - break; - case TestOutcome.Canceled: - asm.CanceledTests++; - asm.TotalTests++; - break; } _terminalWithProgress.UpdateWorker(asm.SlotIndex); @@ -645,7 +636,7 @@ internal void AssemblyRunCompleted(string assembly, string? targetFramework, str private static void AppendAssemblySummary(TestProgressState assemblyRun, ITerminal terminal) { - int failedTests = assemblyRun.FailedTests + assemblyRun.CanceledTests + assemblyRun.TimedOutTests; + int failedTests = assemblyRun.FailedTests; int warnings = 0; AppendAssemblyLinkTargetFrameworkAndArchitecture(terminal, assemblyRun.Assembly, assemblyRun.TargetFramework, assemblyRun.Architecture); diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TestProgressState.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TestProgressState.cs index 6bffb4cc42..7ea23e1b32 100644 --- a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TestProgressState.cs +++ b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TestProgressState.cs @@ -38,10 +38,6 @@ public TestProgressState(string assembly, string? targetFramework, string? archi public int TotalTests { get; internal set; } - public int TimedOutTests { get; internal set; } - - public int CanceledTests { get; internal set; } - public string? Detail { get; internal set; } public int SlotIndex { get; internal set; } diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/OutputDevice/Terminal/TerminalTestReporterTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/OutputDevice/Terminal/TerminalTestReporterTests.cs index d7960c6248..778d05afda 100644 --- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/OutputDevice/Terminal/TerminalTestReporterTests.cs +++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/OutputDevice/Terminal/TerminalTestReporterTests.cs @@ -73,6 +73,7 @@ public void OutputFormattingIsCorrect() errorMessage: null, errorStackTrace: null, expected: null, actual: null); terminalReporter.TestCompleted(assembly, targetFramework, architecture, "SkippedTest1", TestOutcome.Skipped, TimeSpan.FromSeconds(10), errorMessage: null, errorStackTrace: null, expected: null, actual: null); + // timed out + cancelled + failed should all report as failed in summary terminalReporter.TestCompleted(assembly, targetFramework, architecture, "TimedoutTest1", TestOutcome.Timeout, TimeSpan.FromSeconds(10), errorMessage: null, errorStackTrace: null, expected: null, actual: null); terminalReporter.TestCompleted(assembly, targetFramework, architecture, "CanceledTest1", TestOutcome.Canceled, TimeSpan.FromSeconds(10), @@ -107,7 +108,7 @@ public void OutputFormattingIsCorrect() - ␛[90;1m␛]8;;file:///{folderLink}artifact2.txt␛\{folder}artifact2.txt␛]8;;␛\␛[m ␛[91;1mTest run summary: Failed!␛[90;1m - ␛[m␛[90;1m␛]8;;file:///{folderLinkNoSlash}␛\{folder}assembly.dll␛]8;;␛\␛[m (net8.0|x64) ␛[m total: 5 - ␛[91;1m failed: 1 + ␛[91;1m failed: 3 ␛[m succeeded: 1 skipped: 1 duration: 3652058d 23h 59m 59s 999ms