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

Handle process stdout

This commit is contained in:
Ryan Brandenburg 2018-05-18 13:48:23 -07:00
parent 15ca3dcdaa
commit cd516b328e
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/Templates.Test/Helpers/ProcessEx.cs
View File

@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Threading.Tasks;
using Xunit.Abstractions; using Xunit.Abstractions;
namespace Templates.Test.Helpers namespace Templates.Test.Helpers
@ -17,6 +18,7 @@ namespace Templates.Test.Helpers
private readonly StringBuilder _stdoutCapture; private readonly StringBuilder _stdoutCapture;
private readonly object _pipeCaptureLock = new object(); private readonly object _pipeCaptureLock = new object();
private BlockingCollection<string> _stdoutLines; private BlockingCollection<string> _stdoutLines;
private TaskCompletionSource<int> _exited;
public static ProcessEx Run(ITestOutputHelper output, string workingDirectory, string command, string args = null, IDictionary<string, string> envVars = null) public static ProcessEx Run(ITestOutputHelper output, string workingDirectory, string command, string args = null, IDictionary<string, string> envVars = null)
{ {
@ -66,8 +68,12 @@ namespace Templates.Test.Helpers
proc.Exited += OnProcessExited; proc.Exited += OnProcessExited;
proc.BeginOutputReadLine(); proc.BeginOutputReadLine();
proc.BeginErrorReadLine(); proc.BeginErrorReadLine();
_exited = new TaskCompletionSource<int>();
} }
public Task Exited => _exited.Task;
public string Error public string Error
{ {
get get
@ -129,13 +135,15 @@ namespace Templates.Test.Helpers
private void OnProcessExited(object sender, EventArgs e) private void OnProcessExited(object sender, EventArgs e)
{ {
_process.WaitForExit();
_stdoutLines.CompleteAdding(); _stdoutLines.CompleteAdding();
_stdoutLines = null; _stdoutLines = null;
_exited.TrySetResult(_process.ExitCode);
} }
public void WaitForExit(bool assertSuccess) public void WaitForExit(bool assertSuccess)
{ {
_process.WaitForExit(); Exited.Wait();
if (assertSuccess && _process.ExitCode != 0) if (assertSuccess && _process.ExitCode != 0)
{ {
@ -149,6 +157,14 @@ namespace Templates.Test.Helpers
{ {
_process.KillTree(); _process.KillTree();
} }
_process.CancelOutputRead();
_process.CancelErrorRead();
_process.ErrorDataReceived -= OnErrorData;
_process.OutputDataReceived -= OnOutputData;
_process.Exited -= OnProcessExited;
_process.Dispose();
} }
public IEnumerable<string> OutputLinesAsEnumerable => _stdoutLines.GetConsumingEnumerable(); public IEnumerable<string> OutputLinesAsEnumerable => _stdoutLines.GetConsumingEnumerable();