From d6fb0dea2114d1560071d8ac0c16584b253f0b77 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Mon, 4 Mar 2019 19:13:38 -0800 Subject: [PATCH 1/3] Fix test discovery --- src/SignalR/server/StackExchangeRedis/test/Docker.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/SignalR/server/StackExchangeRedis/test/Docker.cs b/src/SignalR/server/StackExchangeRedis/test/Docker.cs index 6286ad39e863..dac59bf584ff 100644 --- a/src/SignalR/server/StackExchangeRedis/test/Docker.cs +++ b/src/SignalR/server/StackExchangeRedis/test/Docker.cs @@ -156,9 +156,11 @@ private static int RunProcessAndWait(string fileName, string arguments, string p process.Close(); logger.LogError("Closing process '{processName}' because it is running longer than the configured timeout.", fileName); } - - // Need to WaitForExit without a timeout to guarantee the output stream has written everything - process.WaitForExit(); + else + { + // Need to WaitForExit without a timeout to guarantee the output stream has written everything + process.WaitForExit(); + } output = string.Join(Environment.NewLine, lines); From 5cd18fb211315f81c529dabf05910ae15cb2968c Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Mon, 4 Mar 2019 20:56:10 -0800 Subject: [PATCH 2/3] more --- src/SignalR/server/StackExchangeRedis/test/Docker.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SignalR/server/StackExchangeRedis/test/Docker.cs b/src/SignalR/server/StackExchangeRedis/test/Docker.cs index dac59bf584ff..0b8bbc74dcce 100644 --- a/src/SignalR/server/StackExchangeRedis/test/Docker.cs +++ b/src/SignalR/server/StackExchangeRedis/test/Docker.cs @@ -132,7 +132,7 @@ public int RunCommand(string commandAndArguments, string prefix, out string outp 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) @@ -155,6 +155,7 @@ private static int RunProcessAndWait(string fileName, string arguments, string p { process.Close(); logger.LogError("Closing process '{processName}' because it is running longer than the configured timeout.", fileName); + return -1; } else { From b43ea7942c0e91e0270d7ff6c854f9fd56611a2c Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Mon, 4 Mar 2019 21:13:44 -0800 Subject: [PATCH 3/3] compile --- src/SignalR/server/StackExchangeRedis/test/Docker.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SignalR/server/StackExchangeRedis/test/Docker.cs b/src/SignalR/server/StackExchangeRedis/test/Docker.cs index 0b8bbc74dcce..c5f613461e9b 100644 --- a/src/SignalR/server/StackExchangeRedis/test/Docker.cs +++ b/src/SignalR/server/StackExchangeRedis/test/Docker.cs @@ -155,6 +155,7 @@ private static int RunProcessAndWait(string fileName, string arguments, string p { process.Close(); 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