Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not match .NET Standard to Dotnet testhost runner #3949

Merged
merged 8 commits into from
Aug 22, 2022
Merged

Do not match .NET Standard to Dotnet testhost runner #3949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4fbb74f
Updated version tag to release.
Haplois Jun 27, 2022
c7ba2ca
Reverts change that breaks DOTNET_ROOT (#3844)
nohwnd Jul 8, 2022
a3d8369
Do not match netstandard for .NET testhost
nohwnd Aug 19, 2022
325dcb1
Fix
nohwnd Aug 19, 2022
101c260
mm
nohwnd Aug 19, 2022
26eb0b9
Merge branch 'main' into fix-matching-netstandard
nohwnd Aug 19, 2022
2d3193b
Fix build break
nohwnd Aug 19, 2022
412743e
Update error formatting and add test
nohwnd Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyOperationManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,11 +271,11 @@ public virtual bool SetupChannel(IEnumerable<string> sources, string? runSetting

// Throw a test platform exception along with the error messages from the test if the test host exited unexpectedly
// before communication was established.
ThrowOnTestHostExited(_testHostExited.IsSet);
ThrowOnTestHostExited(sources, _testHostExited.IsSet);

// Throw a test platform exception stating the connection to test could not be established even after waiting
// for the configure timeout period.
ThrowExceptionOnConnectionFailure(connTimeout);
ThrowExceptionOnConnectionFailure(sources, connTimeout);
}

// Handling special case for dotnet core projects with older test hosts.
Expand Down Expand Up @@ -459,17 +459,17 @@ private void TestHostManagerHostExited(object? sender, HostProviderEventArgs? e)
RequestSender.OnClientProcessExit(_testHostProcessStdError);
}

private void ThrowOnTestHostExited(bool testHostExited)
private void ThrowOnTestHostExited(IEnumerable<string> sources, bool testHostExited)
{
if (testHostExited)
{
// We might consider passing standard output here in case standard error is not
// available because some errors don't end up in the standard error output.
throw new TestPlatformException(string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.TestHostExitedWithError, _testHostProcessStdError));
throw new TestPlatformException(string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.TestHostExitedWithError, string.Join("', '", sources), _testHostProcessStdError));
}
}

private void ThrowExceptionOnConnectionFailure(int connTimeout)
private void ThrowExceptionOnConnectionFailure(IEnumerable<string> sources, int connTimeout)
{
// Failed to launch testhost process.
var errorMsg = CrossPlatEngineResources.InitializationFailed;
Expand All @@ -490,7 +490,7 @@ private void ThrowExceptionOnConnectionFailure(int connTimeout)
if (!StringUtils.IsNullOrWhiteSpace(_testHostProcessStdError))
{
// Testhost failed with error.
errorMsg = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.TestHostExitedWithError, _testHostProcessStdError);
errorMsg = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.TestHostExitedWithError, string.Join("', '", sources), _testHostProcessStdError);
}

throw new TestPlatformException(errorMsg);
Expand Down
5 changes: 3 additions & 2 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@
<value>Logging TestHost Diagnostics in file: {0}</value>
</data>
<data name="TestHostExitedWithError" xml:space="preserve">
<value>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</value>
<value>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</value>
<comment>{0} a source, or very rarely list of sources, {1} the output error.</comment>
</data>
<data name="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" xml:space="preserve">
<value>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</value>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<note></note>
</trans-unit>
<trans-unit id="TestHostExitedWithError">
<source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
<target state="translated">Proces testhost se ukončil s chybou: {0}. Další informace najdete v diagnostických protokolech.</target>
<note></note>
<source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
<target state="new">Proces testhost se ukončil s chybou: {0}. Další informace najdete v diagnostických protokolech.</target>
<note>{0} a source, or very rarely list of sources, {1} the output error.</note>
</trans-unit>
<trans-unit id="DataCollectorDebuggerWarning">
<source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<note></note>
</trans-unit>
<trans-unit id="TestHostExitedWithError">
<source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
<target state="translated">Der TestHost-Prozess wurde mit folgendem Fehler beendet: {0}. Weitere Informationen finden Sie in den Diagnoseprotokollen.</target>
<note></note>
<source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
<target state="new">Der TestHost-Prozess wurde mit folgendem Fehler beendet: {0}. Weitere Informationen finden Sie in den Diagnoseprotokollen.</target>
<note>{0} a source, or very rarely list of sources, {1} the output error.</note>
</trans-unit>
<trans-unit id="DataCollectorDebuggerWarning">
<source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<note></note>
</trans-unit>
<trans-unit id="TestHostExitedWithError">
<source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
<target state="translated">El proceso del host de prueba finalizó con el siguiente error: {0}. Consulte los registros de diagnóstico para obtener más información.</target>
<note></note>
<source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
<target state="new">El proceso del host de prueba finalizó con el siguiente error: {0}. Consulte los registros de diagnóstico para obtener más información.</target>
<note>{0} a source, or very rarely list of sources, {1} the output error.</note>
</trans-unit>
<trans-unit id="DataCollectorDebuggerWarning">
<source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<note></note>
</trans-unit>
<trans-unit id="TestHostExitedWithError">
<source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
<target state="translated">Le processus Testhost s'est arrêté. Erreur : {0}. Pour plus d'informations, consultez les journaux de diagnostic.</target>
<note></note>
<source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
<target state="new">Le processus Testhost s'est arrêté. Erreur : {0}. Pour plus d'informations, consultez les journaux de diagnostic.</target>
<note>{0} a source, or very rarely list of sources, {1} the output error.</note>
</trans-unit>
<trans-unit id="DataCollectorDebuggerWarning">
<source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<note></note>
</trans-unit>
<trans-unit id="TestHostExitedWithError">
<source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
<target state="translated">Il processo testhost è terminato con l'errore {0}. Per altre informazioni, vedere i log di diagnostica.</target>
<note></note>
<source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
<target state="new">Il processo testhost è terminato con l'errore {0}. Per altre informazioni, vedere i log di diagnostica.</target>
<note>{0} a source, or very rarely list of sources, {1} the output error.</note>
</trans-unit>
<trans-unit id="DataCollectorDebuggerWarning">
<source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<note></note>
</trans-unit>
<trans-unit id="TestHostExitedWithError">
<source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
<target state="translated">Testhost プロセスがエラーで終了しました: {0}。詳細については、診断ログを確認してください。</target>
<note></note>
<source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
<target state="new">Testhost プロセスがエラーで終了しました: {0}。詳細については、診断ログを確認してください。</target>
<note>{0} a source, or very rarely list of sources, {1} the output error.</note>
</trans-unit>
<trans-unit id="DataCollectorDebuggerWarning">
<source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<note></note>
</trans-unit>
<trans-unit id="TestHostExitedWithError">
<source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
<target state="translated">Testhost 프로세스가 종료되었습니다(오류: {0}). 자세한 내용은 진단 로그를 확인하세요.</target>
<note></note>
<source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
<target state="new">Testhost 프로세스가 종료되었습니다(오류: {0}). 자세한 내용은 진단 로그를 확인하세요.</target>
<note>{0} a source, or very rarely list of sources, {1} the output error.</note>
</trans-unit>
<trans-unit id="DataCollectorDebuggerWarning">
<source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<note></note>
</trans-unit>
<trans-unit id="TestHostExitedWithError">
<source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
<target state="translated">Zakończono proces testhost z powodu błędu: {0}. Sprawdź dzienniki diagnostyczne, aby uzyskać więcej informacji.</target>
<note></note>
<source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
<target state="new">Zakończono proces testhost z powodu błędu: {0}. Sprawdź dzienniki diagnostyczne, aby uzyskać więcej informacji.</target>
<note>{0} a source, or very rarely list of sources, {1} the output error.</note>
</trans-unit>
<trans-unit id="DataCollectorDebuggerWarning">
<source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<note></note>
</trans-unit>
<trans-unit id="TestHostExitedWithError">
<source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
<target state="translated">O processo do testhost foi encerrado com o erro: {0}. Verifique os logs de diagnóstico para obter mais informações.</target>
<note></note>
<source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
<target state="new">O processo do testhost foi encerrado com o erro: {0}. Verifique os logs de diagnóstico para obter mais informações.</target>
<note>{0} a source, or very rarely list of sources, {1} the output error.</note>
</trans-unit>
<trans-unit id="DataCollectorDebuggerWarning">
<source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<note></note>
</trans-unit>
<trans-unit id="TestHostExitedWithError">
<source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
<target state="translated">Процесс testhost завершился с ошибкой: {0}. Дополнительные сведения см. в журналах диагностики.</target>
<note></note>
<source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
<target state="new">Процесс testhost завершился с ошибкой: {0}. Дополнительные сведения см. в журналах диагностики.</target>
<note>{0} a source, or very rarely list of sources, {1} the output error.</note>
</trans-unit>
<trans-unit id="DataCollectorDebuggerWarning">
<source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<note></note>
</trans-unit>
<trans-unit id="TestHostExitedWithError">
<source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
<target state="translated">Testhost işleminden şu hatayla çıkıldı: {0}. Daha fazla bilgi için lütfen tanılama günlüklerine bakın.</target>
<note></note>
<source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
<target state="new">Testhost işleminden şu hatayla çıkıldı: {0}. Daha fazla bilgi için lütfen tanılama günlüklerine bakın.</target>
<note>{0} a source, or very rarely list of sources, {1} the output error.</note>
</trans-unit>
<trans-unit id="DataCollectorDebuggerWarning">
<source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
<note></note>
</trans-unit>
<trans-unit id="TestHostExitedWithError">
<source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
<source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
<target state="new">Testhost process exited with error: {0}</target>
<note></note>
<note>{0} a source, or very rarely list of sources, {1} the output error.</note>
</trans-unit>
<trans-unit id="DataCollectorDebuggerWarning">
<source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<note></note>
</trans-unit>
<trans-unit id="TestHostExitedWithError">
<source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
<target state="translated">Testhost 进程已退出，但出现错误: {0}。请查看诊断日志了解详细信息。</target>
<note></note>
<source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
<target state="new">Testhost 进程已退出，但出现错误: {0}。请查看诊断日志了解详细信息。</target>
<note>{0} a source, or very rarely list of sources, {1} the output error.</note>
</trans-unit>
<trans-unit id="DataCollectorDebuggerWarning">
<source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<note></note>
</trans-unit>
<trans-unit id="TestHostExitedWithError">
<source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
<target state="translated">Testhost 處理序已結束。錯誤: {0}。如需詳細資訊，請查看診斷記錄。</target>
<note></note>
<source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
<target state="new">Testhost 處理序已結束。錯誤: {0}。如需詳細資訊，請查看診斷記錄。</target>
<note>{0} a source, or very rarely list of sources, {1} the output error.</note>
</trans-unit>
<trans-unit id="DataCollectorDebuggerWarning">
<source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
Expand Down
4 changes: 1 addition & 3 deletions src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,9 +620,7 @@ public bool CanExecuteCurrentRunConfiguration(string? runsettingsXml)
var config = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
var framework = config.TargetFramework;

// This is expected to be called once every run so returning a new instance every time.
return framework!.Name.IndexOf("netstandard", StringComparison.OrdinalIgnoreCase) >= 0
|| framework.Name.IndexOf("netcoreapp", StringComparison.OrdinalIgnoreCase) >= 0
return framework!.Name.IndexOf("netcoreapp", StringComparison.OrdinalIgnoreCase) >= 0
|| framework.Name.IndexOf("net5", StringComparison.OrdinalIgnoreCase) >= 0;
}

Expand Down
Loading