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

Improve killing of processes #338

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Improve killing of processes #338

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
7955833
waiting for process to be killed, add debug output
csoltenborn Feb 17, 2022
1d7d698
fixed cancellation test
csoltenborn Feb 17, 2022
96837d2
trying to fix IndexOutOfRangeException
csoltenborn Feb 17, 2022
e053392
trying to make even more sure that process has been killed :-)
csoltenborn Feb 17, 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
20 changes: 19 additions & 1 deletion GoogleTestAdapter/Common/ProcessUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,37 @@
using System;
using System.Diagnostics;
using System.Threading.Tasks;

namespace GoogleTestAdapter.Common
{
public static class ProcessUtils
{
public static void KillProcess(int processId, ILogger logger)
{
logger.DebugInfo($"Scheduling to kill process with id {processId}...");
Task.Run(() => DoKillProcess(processId, logger));
}

private static void DoKillProcess(int processId, ILogger logger)
{
try
{
Process process = Process.GetProcessById(processId);
DateTime startTime = process.StartTime;
try
{
logger.DebugInfo($"Trying to kill process {process} with startTime={startTime.ToShortTimeString()}");
process.Kill();
logger.DebugInfo($"Killed process {process} with startTime={startTime.ToShortTimeString()}");
logger.DebugInfo($"Invoked Kill() on process {process} with startTime={startTime.ToShortTimeString()}, waiting for it to exit...");
process.WaitForExit();
if (process.HasExited)
{
logger.DebugInfo($"Successfully killed process {process} with startTime={startTime.ToShortTimeString()}");
}
else
{
logger.DebugWarning($"Wasn't able to kill process {process} with startTime={startTime.ToShortTimeString()}...");
}
}
catch (Exception e)
{
Expand All @@ -24,6 +41,7 @@ public static void KillProcess(int processId, ILogger logger)
catch (Exception)
{
// process was not running - nothing to do
logger.DebugInfo($"Process with id {processId} should be killed, but apparently was not running");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion GoogleTestAdapter/Core.Tests/TestCases/TestCaseFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void CreateTestCases_DiscoveryTimeoutIsExceeded_DiscoveryIsCanceledAndCan

reportedTestCases.Should().BeEmpty();
returnedTestCases.Should().BeEmpty();
stopWatch.Elapsed.Should().BeGreaterOrEqualTo(TimeSpan.FromSeconds(1));
stopWatch.Elapsed.Should().BeGreaterOrEqualTo(TimeSpan.FromSeconds(0.9));
stopWatch.Elapsed.Should().BeLessThan(TimeSpan.FromSeconds(2));
MockLogger.Verify(o => o.LogError(It.Is<string>(s => s.Contains(TestResources.TenSecondsWaiter))), Times.Once);
MockLogger.Verify(o => o.DebugError(It.Is<string>(s => s.Contains(Path.GetFileName(TestResources.TenSecondsWaiter)))), Times.AtLeastOnce);
Expand Down
17 changes: 9 additions & 8 deletions GoogleTestAdapter/Tests.Common/Helpers/TestProcessLauncher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using GoogleTestAdapter.Common;
Expand All @@ -19,18 +20,18 @@ public int GetOutputStreams(string workingDirectory, string command, string para
{
Process process = CreateProcess(workingDirectory, command, param);

var localStandardOut = new List<string>();
var localStandardErr = new List<string>();
var localAllOutput = new List<string>();
var localStandardOut = new ConcurrentQueue<string>();
var localStandardErr = new ConcurrentQueue<string>();
var localAllOutput = new ConcurrentQueue<string>();
process.OutputDataReceived += (sender, e) =>
{
localStandardOut.Add(e.Data);
localAllOutput.Add(e.Data);
localStandardOut.Enqueue(e.Data);
localAllOutput.Enqueue(e.Data);
};
process.ErrorDataReceived += (sender, e) =>
{
localStandardErr.Add(e.Data);
localAllOutput.Add(e.Data);
localStandardErr.Enqueue(e.Data);
localAllOutput.Enqueue(e.Data);
};

try
Expand Down