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

Fix test discovery (#8201)

This commit is contained in:
BrennanConroy 2019-03-04 23:11:16 -08:00 committed by GitHub
parent 33839dc66a
commit c8c12cda9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/SignalR/server/StackExchangeRedis/test/Docker.cs
View File

@ -132,7 +132,7 @@ namespace Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests
public int RunCommand(string commandAndArguments, string prefix, ILogger logger, out string output) public int RunCommand(string commandAndArguments, string prefix, ILogger logger, out string output)
{ {
return RunProcessAndWait(_path, commandAndArguments, prefix, logger, TimeSpan.FromSeconds(5), out output); return RunProcessAndWait(_path, commandAndArguments, prefix, logger, TimeSpan.FromSeconds(30), out output);
} }
private static void RunProcessAndThrowIfFailed(string fileName, string arguments, string prefix, ILogger logger, TimeSpan timeout) private static void RunProcessAndThrowIfFailed(string fileName, string arguments, string prefix, ILogger logger, TimeSpan timeout)
@ -155,10 +155,14 @@ namespace Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests
{ {
process.Close(); process.Close();
logger.LogError("Closing process '{processName}' because it is running longer than the configured timeout.", fileName); logger.LogError("Closing process '{processName}' because it is running longer than the configured timeout.", fileName);
output = string.Join(Environment.NewLine, lines.ToArray());
return -1;
}
else
{
// Need to WaitForExit without a timeout to guarantee the output stream has written everything
process.WaitForExit();
} }
// Need to WaitForExit without a timeout to guarantee the output stream has written everything
process.WaitForExit();
output = string.Join(Environment.NewLine, lines); output = string.Join(Environment.NewLine, lines);