From 9b8320edf62c8b83fa8fd7a2cf7c4de4abf99184 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <hi@nhooyr.io>
Date: Fri, 27 Sep 2019 17:32:51 -0500
Subject: [PATCH] Remove fifo from wasm.sh

Should prevent the sporadic failures in CI.
---
 ci/wasm.sh                | 10 +++++-----
 internal/wsjstest/main.go |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ci/wasm.sh b/ci/wasm.sh
index 1497ba24..d25a0750 100755
--- a/ci/wasm.sh
+++ b/ci/wasm.sh
@@ -9,13 +9,13 @@ GOOS=js GOARCH=wasm go vet ./...
 go install golang.org/x/lint/golint
 GOOS=js GOARCH=wasm golint -set_exit_status ./...
 
-wsjstestOut="$(mktemp -d)/stdout"
-mkfifo "$wsjstestOut"
+wsjstestOut="$(mktemp)"
 go install ./internal/wsjstest
-timeout 30s wsjstest > "$wsjstestOut" &
+timeout 30s wsjstest >> "$wsjstestOut" &
 wsjstestPID=$!
 
-WS_ECHO_SERVER_URL="$(timeout 10s head -n 1 "$wsjstestOut")" || true
+# See https://superuser.com/a/900134
+WS_ECHO_SERVER_URL="$( (tail -f -n0 "$wsjstestOut" &) | timeout 10s head -n 1)"
 if [[ -z $WS_ECHO_SERVER_URL ]]; then
   echo "./internal/wsjstest failed to start in 10s"
   exit 1
@@ -25,7 +25,7 @@ go install github.com/agnivade/wasmbrowsertest
 GOOS=js GOARCH=wasm go test -exec=wasmbrowsertest ./... -args "$WS_ECHO_SERVER_URL"
 
 if ! wait "$wsjstestPID"; then
-  echo "wsjstest exited unsuccessfully"
+  echo "--- wsjstest exited unsuccessfully"
   echo "output:"
   cat "$wsjstestOut"
   exit 1
diff --git a/internal/wsjstest/main.go b/internal/wsjstest/main.go
index a1ad1b02..9aeb9b14 100644
--- a/internal/wsjstest/main.go
+++ b/internal/wsjstest/main.go
@@ -36,6 +36,7 @@ func main() {
 
 		os.Exit(0)
 	}))
+
 	wsURL := strings.Replace(s.URL, "http", "ws", 1)
 	fmt.Printf("%v\n", wsURL)