Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swap order of waitForProcess and hGetContents to avoid blocking on windows #2101

Merged
merged 1 commit into from
Sep 5, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/core-integration/src/Test/Integration/Framework/DSL.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1636,9 +1636,15 @@ postTransactionViaCLI ctx passphrase args = do
hPutStr stdin (passphrase ++ "\n")
hFlush stdin
hClose stdin
c <- waitForProcess h
out <- TIO.hGetContents stdout
err <- TIO.hGetContents stderr
-- For some reason, when
-- - waitForProcess is called before hGetContents
-- - os is windows
-- - postTransactionViaCLI was called with >= 5 outputs
-- waitForProcess blocks indefinetely. Hence we call waitForProcess
-- last.
c <- waitForProcess h
return (c, T.unpack out, err)

postTransactionFeeViaCLI
Expand Down