fix bug reported on gitter

fsprojects · Jan 13, 2020 · 4344fb1 · 4344fb1
1 parent 3b0a8aa
commit 4344fb1
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/src/app/Fake.Core.Process/CreateProcess.fs b/src/app/Fake.Core.Process/CreateProcess.fs
@@ -173,8 +173,8 @@ module CreateProcess =
                 |> EnvMap.ofSeq
                 |> Some
             Streams =
-                {   StandardInput = if p.RedirectStandardError then CreatePipe StreamRef.Empty else Inherit
-                    StandardOutput = if p.RedirectStandardError then CreatePipe StreamRef.Empty else Inherit
+                {   StandardInput = if p.RedirectStandardInput then CreatePipe StreamRef.Empty else Inherit
+                    StandardOutput = if p.RedirectStandardOutput then CreatePipe StreamRef.Empty else Inherit
                     StandardError = if p.RedirectStandardError then CreatePipe StreamRef.Empty else Inherit
                 }
             Hook = emptyHook

diff --git a/src/test/Fake.Core.UnitTests/Fake.Core.Process.fs b/src/test/Fake.Core.UnitTests/Fake.Core.Process.fs
@@ -93,4 +93,45 @@ let tests =
             |> CreateProcess.fromRawCommandLine "./folder/mytool.exe"
             |> getRawCommandLine
         Expect.equal actual original "Expected to retrieve exact match"
+
+    yield testCase "Test CreateProcess.ofStartInfo with different streams - reported on gitter" <| fun _ ->
+        let isRedirected s =
+            match s with
+            | StreamSpecification.Inherit -> false
+            | _ -> true
+
+        let si = System.Diagnostics.ProcessStartInfo()
+        let actual =
+            si
+            |> CreateProcess.ofStartInfo
+        Expect.isFalse (isRedirected actual.Streams.StandardInput) "Expect Std Input to be NOT redirected"
+        Expect.isFalse (isRedirected actual.Streams.StandardOutput) "Expect Std Output to be NOT redirected"
+        Expect.isFalse (isRedirected actual.Streams.StandardError) "Expect Std Error to be NOT redirected"
+
+        let si = System.Diagnostics.ProcessStartInfo()
+        si.RedirectStandardInput <- true
+        let actual =
+            si
+            |> CreateProcess.ofStartInfo
+        Expect.isTrue (isRedirected actual.Streams.StandardInput) "Expect Std Input to be redirected"
+        Expect.isFalse (isRedirected actual.Streams.StandardOutput) "Expect Std Output to be NOT redirected"
+        Expect.isFalse (isRedirected actual.Streams.StandardError) "Expect Std Error to be NOT redirected"
+
+        let si = System.Diagnostics.ProcessStartInfo()
+        si.RedirectStandardOutput <- true
+        let actual =
+            si
+            |> CreateProcess.ofStartInfo
+        Expect.isFalse (isRedirected actual.Streams.StandardInput) "Expect Std Input to be NOT redirected"
+        Expect.isTrue (isRedirected actual.Streams.StandardOutput) "Expect Std Output to be redirected"
+        Expect.isFalse (isRedirected actual.Streams.StandardError) "Expect Std Error to be NOT redirected"
+
+        let si = System.Diagnostics.ProcessStartInfo()
+        si.RedirectStandardError <- true
+        let actual =
+            si
+            |> CreateProcess.ofStartInfo
+        Expect.isFalse (isRedirected actual.Streams.StandardInput) "Expect Std Input to be NOT redirected"
+        Expect.isFalse (isRedirected actual.Streams.StandardOutput) "Expect Std Output to be NOT redirected"
+        Expect.isTrue (isRedirected actual.Streams.StandardError) "Expect Std Error to be redirected"
   ]
diff --git a/src/test/Fake.ExpectoSupport/ExpectoHelpers.fs b/src/test/Fake.ExpectoSupport/ExpectoHelpers.fs
@@ -99,13 +99,14 @@ module ExpectoHelpers =
               let! result = Task.WhenAny(t, delay) |> Async.AwaitTask
               if result = delay then
                 Expecto.Tests.failtestf "Test '%s' timed out" labelPath
+              return result.GetAwaiter().GetResult()
           }
 
         match test with
         | Expecto.Sync test -> async { test() } |> timeoutAsync |> Expecto.Async
         | Expecto.SyncWithCancel test ->
           Expecto.SyncWithCancel (fun ct ->
-            Async.StartImmediate(async { test ct } |> timeoutAsync)
+            Async.StartImmediate(async { test (CancellationToken.None) } |> timeoutAsync)
           )
         | Expecto.Async test -> timeoutAsync test |> Expecto.Async
         | Expecto.AsyncFsCheck (testConfig, stressConfig, test) ->