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

Fixed Selenium test run hang after stopping the debugger #3995

Merged
merged 5 commits into from Sep 8, 2022
Merged

Fixed Selenium test run hang after stopping the debugger #3995

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d4ba2a
Fixed Selenium test hang
Sep 7, 2022
38f9569
Merge branch 'main' into copoiena/selenium-test-hang-fix
Sep 7, 2022
e541166
Fixed code review comments
Sep 7, 2022
aabe00f
Fixed pipeline fail on Ubuntu/macOS
Sep 7, 2022
ab015f8
Fixed pipeline for Ubuntu/macOS attempt #2
Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/Microsoft.TestPlatform.PlatformAbstractions/common/System/ProcessHelper.cs
View file
Open in desktop
Expand Up @@ -84,6 +84,8 @@ void InitializeAndStart()

if (exitCallBack != null)
{
const int timeout = 500;
cvpoienaru marked this conversation as resolved.
Show resolved Hide resolved

process.Exited += async (sender, args) =>
{
if (sender is Process p)
Expand All @@ -102,11 +104,20 @@ void InitializeAndStart()
//
// For older frameworks, the solution is more tricky but it seems we can get the expected
// behavior using the parameterless 'WaitForExit()' combined with an awaited Task.Run call.
var cts = new CancellationTokenSource(500);
var cts = new CancellationTokenSource(timeout);
#if NET5_0_OR_GREATER
await p.WaitForExitAsync(cts.Token);
#else
await Task.Run(() => p.WaitForExit(), cts.Token);
var os = new PlatformEnvironment().OperatingSystem;
cvpoienaru marked this conversation as resolved.
Show resolved Hide resolved
if (os is PlatformOperatingSystem.Windows)
{
p.WaitForExit(timeout);
Evangelink marked this conversation as resolved.
Show resolved Hide resolved
cvpoienaru marked this conversation as resolved.
Show resolved Hide resolved
}
else
{
cts.Token.Register(() => p.Kill());
await Task.Run(() => p.WaitForExit(), cts.Token).ConfigureAwait(false);
}
#endif
}
catch
Expand Down