From bafde7738f16553a6f78e19263d40c9c83288066 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Thu, 28 Jun 2018 09:31:42 -0700 Subject: [PATCH] Harden docker detection (#2552) --- .../Docker.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/test/Microsoft.AspNetCore.SignalR.Redis.Tests/Docker.cs b/test/Microsoft.AspNetCore.SignalR.Redis.Tests/Docker.cs index b2691a5fa1..94b19673e7 100644 --- a/test/Microsoft.AspNetCore.SignalR.Redis.Tests/Docker.cs +++ b/test/Microsoft.AspNetCore.SignalR.Redis.Tests/Docker.cs @@ -37,15 +37,12 @@ namespace Microsoft.AspNetCore.SignalR.Redis.Tests var docker = new Docker(location); - // Windows docker must have Linux containers turned on, if they don't skip the docker tests - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - docker.RunCommand("info --format '{{.OSType}}'", out var output); + docker.RunCommand("info --format '{{.OSType}}'", out var output); - if (!string.Equals(output, "linux")) - { - return null; - } + if (!string.Equals(output.Trim('\'', '"', '\r', '\n', ' '), "linux")) + { + Console.WriteLine($"'docker info' output: {output}"); + return null; } return docker;