diff options
| author | Damian Edwards <damian@damianedwards.com> | 2022-05-13 06:42:48 +0300 |
|---|---|---|
| committer | Damian Edwards <damian@damianedwards.com> | 2022-05-13 06:42:48 +0300 |
| commit | 5e9747a3bda68ebb70dbaa8eb505b9a3d6689783 (patch) | |
| tree | 2cf31bd94de47199cc9d38bc691a65ff6e2e6bdc | |
| parent | 70f60d07b573b5d381f1374cab646f9449e51764 (diff) | |
Port TestRunner.cs changesdedward/41529-template-namespace
| -rw-r--r-- | eng/helix/content/RunTests/TestRunner.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs index c66b131ed2..d951ea512f 100644 --- a/eng/helix/content/RunTests/TestRunner.cs +++ b/eng/helix/content/RunTests/TestRunner.cs @@ -216,7 +216,8 @@ namespace RunTests var testProcessTimeout = Options.Timeout.Subtract(TimeSpan.FromMinutes(5)); var cts = new CancellationTokenSource(testProcessTimeout); var diagLog = Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_UPLOAD_ROOT"), "vstest.log"); - var commonTestArgs = $"test {Options.Target} --diag:{diagLog} --logger:xunit --logger:\"console;verbosity=normal\" --blame \"CollectHangDump;CollectDump;TestTimeout=15m\""; + var commonTestArgs = $"test {Options.Target} --diag:{diagLog} --logger xunit --logger \"console;verbosity=normal\" " + + "--blame-crash --blame-hang-timeout 15m"; if (Options.Quarantined) { ProcessUtil.PrintMessage("Running quarantined tests."); @@ -230,12 +231,12 @@ namespace RunTests throwOnError: false, cancellationToken: cts.Token); + if (cts.Token.IsCancellationRequested) + { + ProcessUtil.PrintMessage($"Quarantined tests exceeded configured timeout: {testProcessTimeout.TotalMinutes}m."); + } if (result.ExitCode != 0) { - if (cts.Token.IsCancellationRequested) - { - ProcessUtil.PrintMessage($"Quarantined tests exceeded configured timeout: {testProcessTimeout.TotalMinutes}m."); - } ProcessUtil.PrintMessage($"Failure in quarantined tests. Exit code: {result.ExitCode}."); } } @@ -252,13 +253,12 @@ namespace RunTests throwOnError: false, cancellationToken: cts.Token); + if (cts.Token.IsCancellationRequested) + { + ProcessUtil.PrintMessage($"Non-quarantined tests exceeded configured timeout: {testProcessTimeout.TotalMinutes}m."); + } if (result.ExitCode != 0) { - if (cts.Token.IsCancellationRequested) - { - ProcessUtil.PrintMessage($"Non-quarantined tests exceeded configured timeout: {testProcessTimeout.TotalMinutes}m."); - } - ProcessUtil.PrintMessage($"Failure in non-quarantined tests. Exit code: {result.ExitCode}."); exitCode = result.ExitCode; } |