diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameLogger.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameLogger.cs index 255e4451ae..3874282614 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameLogger.cs +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameLogger.cs @@ -112,15 +112,13 @@ private void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e) return; } - this.output.Error(false, Resources.Resources.AbortedTestRun); - StringBuilder sb = new StringBuilder(); foreach (var tcn in testCaseNames) { sb.Append(tcn).Append(Environment.NewLine); } - this.output.Error(false, sb.ToString()); + this.output.Error(false, Resources.Resources.AbortedTestRun, sb.ToString()); } #endregion diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.Designer.cs index 53cf4ade1e..e34c6b30ba 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.Designer.cs +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.Designer.cs @@ -61,7 +61,10 @@ internal Resources() { } /// - /// Looks up a localized string similar to The active Test Run was aborted because the host process exited unexpectedly while executing following test(s):. + /// Looks up a localized string similar to The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. + ///The test running when the crash occurred: + ///{0} + ///This test may, or may not be the source of the crash.. /// internal static string AbortedTestRun { get { diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.resx b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.resx index a500d52c84..4d5c69c20d 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.resx +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.resx @@ -118,7 +118,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. The blame parameter key specified {0} is not valid. Ignoring this key. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.cs.xlf index 7f9f38e301..e70ff548d3 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.cs.xlf +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.cs.xlf @@ -21,9 +21,12 @@ - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): - Aktivní testovací běh byl přerušen, protože hostitelský proces byl neočekávaně ukončen při provádění následujících testů: - + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. + Aktivní testovací běh byl přerušen, protože hostitelský proces byl neočekávaně ukončen při provádění následujících testů: + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.de.xlf index 9df340f2a0..a1235bf501 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.de.xlf +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.de.xlf @@ -21,9 +21,12 @@ - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): - Der aktive Testlauf wurde abgebrochen, weil der Hostprozess beim Ausführen der folgenden Tests unerwartet beendet wurde: - + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. + Der aktive Testlauf wurde abgebrochen, weil der Hostprozess beim Ausführen der folgenden Tests unerwartet beendet wurde: + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.es.xlf index 7f7b152970..2774c34d0f 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.es.xlf +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.es.xlf @@ -21,9 +21,12 @@ - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): - La serie de pruebas activa se anuló porque el proceso del host se cerró inesperadamente al ejecutar las pruebas siguientes: - + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. + La serie de pruebas activa se anuló porque el proceso del host se cerró inesperadamente al ejecutar las pruebas siguientes: + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.fr.xlf index 4b02e78d1c..7f13e124fb 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.fr.xlf +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.fr.xlf @@ -21,9 +21,12 @@ - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): - La série de tests active a été abandonnée, car le processus hôte s'est arrêté de manière inattendue durant l'exécution du ou des tests suivants : - + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. + La série de tests active a été abandonnée, car le processus hôte s'est arrêté de manière inattendue durant l'exécution du ou des tests suivants : + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.it.xlf index f7c63ec22f..e16e7fb09c 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.it.xlf +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.it.xlf @@ -21,9 +21,12 @@ - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): - L'esecuzione dei test attiva è stata interrotta perché il processo host è stato terminato in modo imprevisto durante l'esecuzione del test o dei test seguenti: - + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. + L'esecuzione dei test attiva è stata interrotta perché il processo host è stato terminato in modo imprevisto durante l'esecuzione del test o dei test seguenti: + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ja.xlf index f72bb9bcb9..c2d6bd1575 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ja.xlf +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ja.xlf @@ -21,9 +21,12 @@ - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): - 以下のテストの実行中にホスト プロセスが予期せず終了したため、アクティブなテスト実行が中止されました: - + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. + 以下のテストの実行中にホスト プロセスが予期せず終了したため、アクティブなテスト実行が中止されました: + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ko.xlf index 921bebc97b..cbc85432d1 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ko.xlf +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ko.xlf @@ -21,9 +21,12 @@ - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): - 다음 테스트를 실행하는 동안 호스트 프로세스가 예기치 않게 종료되어 활성 테스트 실행이 중단되었습니다. - + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. + 다음 테스트를 실행하는 동안 호스트 프로세스가 예기치 않게 종료되어 활성 테스트 실행이 중단되었습니다. + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pl.xlf index 5f6203d752..6e0651cf89 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pl.xlf +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pl.xlf @@ -21,9 +21,12 @@ - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): - Aktywny przebieg testu został przerwany, ponieważ proces hosta nieoczekiwanie zakończył działanie podczas wykonywania następujących testów: - + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. + Aktywny przebieg testu został przerwany, ponieważ proces hosta nieoczekiwanie zakończył działanie podczas wykonywania następujących testów: + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pt-BR.xlf index 4f074f78ff..6aa314fdc7 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pt-BR.xlf +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pt-BR.xlf @@ -21,9 +21,12 @@ - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): - A Execução de Teste ativa foi anulada pois o processo do host saiu inesperadamente ao executar os seguintes testes: - + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. + A Execução de Teste ativa foi anulada pois o processo do host saiu inesperadamente ao executar os seguintes testes: + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ru.xlf index 31dc3a8f86..0a710dd9c9 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ru.xlf +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ru.xlf @@ -21,9 +21,12 @@ - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): - Активный тестовый запуск прерван, так как хост-процесс завершил работу непредвиденным образом при выполнении следующих тестов: - + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. + Активный тестовый запуск прерван, так как хост-процесс завершил работу непредвиденным образом при выполнении следующих тестов: + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.tr.xlf index fda57e82e4..23c3668e97 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.tr.xlf +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.tr.xlf @@ -21,9 +21,12 @@ - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): - Aşağıdaki testler yürütülürken konak işleminden beklenmedik bir şekilde çıkıldığından etkin Test Çalıştırması iptal edildi: - + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. + Aşağıdaki testler yürütülürken konak işleminden beklenmedik bir şekilde çıkıldığından etkin Test Çalıştırması iptal edildi: + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf index adde775921..9667764550 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf @@ -3,9 +3,12 @@ - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. The active Test Run was aborted because the host process exited unexpectedly while executing test - + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hans.xlf index 5bdd34c08c..55fd327124 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hans.xlf +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hans.xlf @@ -21,9 +21,12 @@ - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): - 执行以下测试时主机进程意外退出,活动的测试运行已中止: - + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. + 执行以下测试时主机进程意外退出,活动的测试运行已中止: + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hant.xlf index c5cf368aa6..9be9aec885 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hant.xlf +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hant.xlf @@ -21,9 +21,12 @@ - The active Test Run was aborted because the host process exited unexpectedly while executing following test(s): - 因為主機處理序在執行下列測試時未預期地結束,所以使用中的測試回合已中止: - + The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from. +The test running when the crash occurred: +{0} +This test may, or may not be the source of the crash. + 因為主機處理序在執行下列測試時未預期地結束,所以使用中的測試回合已中止: + {0} is a single test (or in rare cases multiple tests) that were running when test host crashed. Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable. diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/WindowsHangDumper.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/WindowsHangDumper.cs index c1912b5fb1..c0aeed16c2 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/WindowsHangDumper.cs +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/WindowsHangDumper.cs @@ -68,12 +68,10 @@ public void Dump(int processId, string outputDirectory, DumpTypeOption type) } } - Thread.Sleep(1300); foreach (var p in bottomUpTree) { try { - Thread.Sleep(500); var outputFile = Path.Combine(outputDirectory, $"{p.ProcessName}_{p.Id}_{DateTime.Now:yyyyMMddTHHmmss}_hangdump.dmp"); CollectDump(p, outputFile, type); } diff --git a/src/vstest.console/Program.cs b/src/vstest.console/Program.cs index abe4ca5eed..484f9f9a7a 100644 --- a/src/vstest.console/Program.cs +++ b/src/vstest.console/Program.cs @@ -18,10 +18,7 @@ public static class Program /// Arguments provided on the command line. /// 0 if everything was successful and 1 otherwise. public static int Main(string[] args) - { - Environment.SetEnvironmentVariable("COMPlus_DbgEnableElfDumpOnMacOS", "1"); - Environment.SetEnvironmentVariable("COMPlus_DbgEnableMiniDump", "1"); - + { var debugEnabled = Environment.GetEnvironmentVariable("VSTEST_RUNNER_DEBUG"); if (!string.IsNullOrEmpty(debugEnabled) && debugEnabled.Equals("1", StringComparison.Ordinal)) { diff --git a/test/vstest.console.UnitTests/ExecutorUnitTests.cs b/test/vstest.console.UnitTests/ExecutorUnitTests.cs index 3fe3820b8f..f5748b8c49 100644 --- a/test/vstest.console.UnitTests/ExecutorUnitTests.cs +++ b/test/vstest.console.UnitTests/ExecutorUnitTests.cs @@ -21,6 +21,7 @@ namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests using Utilities; using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources; + using System; [TestClass] public class ExecutorUnitTests