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

Jump to bottom

SystemProcessHandler start cant return null #3002

Merged
merged 4 commits into from
May 28, 2024
Merged

SystemProcessHandler start cant return null #3002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4805936
SystemProcessHandler start cant return null
SimonCropp May 28, 2024
89bb1aa
Update src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemP…
Evangelink May 28, 2024
a7b3f1e
Fix issues
Evangelink May 28, 2024
c1e7ffa
Merge branch 'main' into SystemProcessHandler-start-ant-return-null
Evangelink May 28, 2024
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
2 changes: 1 addition & 1 deletion src/Platform/Microsoft.Testing.Platform/Helpers/System/IProcessHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ internal interface IProcessHandler

IProcess GetCurrentProcess();

IProcess? Start(ProcessStartInfo startInfo);
IProcess Start(ProcessStartInfo startInfo);
}
13 changes: 9 additions & 4 deletions src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemProcessHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;

using Microsoft.Testing.Platform.Resources;

namespace Microsoft.Testing.Platform.Helpers;

Expand All @@ -13,11 +16,13 @@ internal sealed class SystemProcessHandler : IProcessHandler

public IProcess GetProcessById(int pid) => new SystemProcess(Process.GetProcessById(pid));

public IProcess? Start(ProcessStartInfo startInfo)
public IProcess Start(ProcessStartInfo startInfo)
{
var process = Process.Start(startInfo);
ApplicationStateGuard.Ensure(process is not null);
Process process = Process.Start(startInfo)
?? throw new InvalidOperationException(string.Format(
CultureInfo.InvariantCulture,
PlatformResources.CannotStartProcessErrorMessage, startInfo.FileName));
process.EnableRaisingEvents = true;
return process is null ? null : (IProcess)new SystemProcess(process);
return new SystemProcess(process);
}
}
3 changes: 1 addition & 2 deletions src/Platform/Microsoft.Testing.Platform/Hosts/TestHostControllersTestHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,7 @@ protected override async Task<int> InternalRunAsync()
processStartInfo.EnvironmentVariables.Add($"{EnvironmentVariableConstants.TESTINGPLATFORM_TESTHOSTCONTROLLER_TESTHOSTPROCESSSTARTTIME}_{currentPID}", testHostProcessStartupTime);
await _logger.LogDebugAsync($"{EnvironmentVariableConstants.TESTINGPLATFORM_TESTHOSTCONTROLLER_TESTHOSTPROCESSSTARTTIME}_{currentPID} '{testHostProcessStartupTime}'");
await _logger.LogDebugAsync($"Starting test host process");
IProcess testHostProcess = process.Start(processStartInfo)
?? throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, PlatformResources.CannotStartProcessErrorMessage, processStartInfo.FileName));
IProcess testHostProcess = process.Start(processStartInfo);

testHostProcess.Exited += (sender, e) =>
{
Expand Down