huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try synchronizing dispose and output (#20341)

This commit is contained in:
John Luo 2020-04-01 10:03:30 -07:00 committed by GitHub
parent 85b1a73f65
commit 71327c03ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Shared/Process/ProcessEx.cs
View File

@ -26,9 +26,11 @@ namespace Microsoft.AspNetCore.Internal
private readonly StringBuilder _stderrCapture; private readonly StringBuilder _stderrCapture;
private readonly StringBuilder _stdoutCapture; private readonly StringBuilder _stdoutCapture;
private readonly object _pipeCaptureLock = new object(); private readonly object _pipeCaptureLock = new object();
private readonly object _testOutputLock = new object();
private BlockingCollection<string> _stdoutLines; private BlockingCollection<string> _stdoutLines;
private TaskCompletionSource<int> _exited; private TaskCompletionSource<int> _exited;
private CancellationTokenSource _stdoutLinesCancellationSource = new CancellationTokenSource(TimeSpan.FromMinutes(5)); private CancellationTokenSource _stdoutLinesCancellationSource = new CancellationTokenSource(TimeSpan.FromMinutes(5));
private bool _disposed = false;
public ProcessEx(ITestOutputHelper output, Process proc) public ProcessEx(ITestOutputHelper output, Process proc)
{ {
@ -135,7 +137,13 @@ namespace Microsoft.AspNetCore.Internal
_stderrCapture.AppendLine(e.Data); _stderrCapture.AppendLine(e.Data);
} }
_output.WriteLine("[ERROR] " + e.Data); lock (_testOutputLock)
{
if (!_disposed)
{
_output.WriteLine("[ERROR] " + e.Data);
}
}
} }
private void OnOutputData(object sender, DataReceivedEventArgs e) private void OnOutputData(object sender, DataReceivedEventArgs e)
@ -150,7 +158,13 @@ namespace Microsoft.AspNetCore.Internal
_stdoutCapture.AppendLine(e.Data); _stdoutCapture.AppendLine(e.Data);
} }
_output.WriteLine(e.Data); lock (_testOutputLock)
{
if (!_disposed)
{
_output.WriteLine(e.Data);
}
}
if (_stdoutLines != null) if (_stdoutLines != null)
{ {
@ -204,6 +218,11 @@ namespace Microsoft.AspNetCore.Internal
public void Dispose() public void Dispose()
{ {
lock (_testOutputLock)
{
_disposed = true;
}
if (_process != null && !_process.HasExited) if (_process != null && !_process.HasExited)
{ {
_process.KillTree(); _process.KillTree();