From dac93dd66465f544bf0e1209c9d564a675f511c4 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Thu, 29 Nov 2018 01:09:39 -0800
Subject: [PATCH] really fix netcat race

We hit this once every few Jenkins runs. This:

1. Ensures netcat has started before we try to use it.
2. Waits for it to actually write the request before trying to read it.

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
---
 test/sharness/t0235-cli-request.sh         | 40 +++++++++++++++++++---
 test/sharness/t0236-cli-api-dns-resolve.sh | 40 +++++++++++++++++++---
 2 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/test/sharness/t0235-cli-request.sh b/test/sharness/t0235-cli-request.sh
index 42931a2c5bd6..7d859b64cb07 100755
--- a/test/sharness/t0235-cli-request.sh
+++ b/test/sharness/t0235-cli-request.sh
@@ -10,11 +10,43 @@ test_description="test http requests made by cli"
 
 test_init_ipfs
 
-test_expect_success "can make http request against nc server" '
-  nc -ld 5005 > nc_out &
+test_expect_success "start nc" '
+  rm -f nc_out nc_outp nc_inp nc_statusp && mkfifo nc_inp nc_outp nc_statusp
+
+  nc -v -l 127.0.0.1 5005 <nc_inp >nc_outp 2>nc_statusp &
   NCPID=$!
-  go-sleep 0.5s && kill "$NCPID" &
-  ipfs cat /ipfs/Qmabcdef --api /ip4/127.0.0.1/tcp/5005 || true
+'
+
+test_expect_success "open nc pipes" '
+  exec 6>nc_inp 7<nc_outp &&
+'
+
+test_expect_success "wait for nc" '
+  head -1 <nc_statusp
+'
+
+test_expect_success "can make http request against nc server" '
+  ipfs cat /ipfs/Qmabcdef --api /ip4/127.0.0.1/tcp/5005 &
+  IPFSPID=$!
+
+  head -1 <nc_statusp &&
+
+  # handle request
+  while read line; do
+    if [[ "$line" == "$(echo -e "\r")" ]]; then
+      break
+    fi
+    echo "$line"
+  done <&7 >nc_out &&
+
+  echo -e "HTTP/1.1 200 OK\r" >&6 &&
+  echo -e "Content-Type: text/plain\r" >&6 &&
+  echo -e "Content-Length: 0\r" >&6 &&
+  echo -e "\r" >&6 &&
+  exec 6<&- &&
+
+  # Wait for IPFS and netcat
+  wait $IPFSPID $NCPID
 '
 
 test_expect_success "output does not contain multipart info" '
diff --git a/test/sharness/t0236-cli-api-dns-resolve.sh b/test/sharness/t0236-cli-api-dns-resolve.sh
index 18aa2246019a..0028004ae644 100755
--- a/test/sharness/t0236-cli-api-dns-resolve.sh
+++ b/test/sharness/t0236-cli-api-dns-resolve.sh
@@ -10,11 +10,43 @@ test_description="test dns resolution of api endpoint by cli"
 
 test_init_ipfs
 
-test_expect_success "can make http request against dns resolved nc server" '
-  nc -ld 5005 > nc_out &
+test_expect_success "start nc" '
+  rm -f nc_out nc_outp nc_inp nc_statusp && mkfifo nc_inp nc_outp nc_statusp
+
+  nc -v -l 127.0.0.1 5006 <nc_inp >nc_outp 2>nc_statusp &
   NCPID=$!
-  go-sleep 1s && kill "$NCPID" &
-  ipfs cat /ipfs/Qmabcdef --api /dns4/localhost/tcp/5005 || true
+'
+
+test_expect_success "open nc pipes" '
+  exec 6>nc_inp 7<nc_outp &&
+'
+
+test_expect_success "wait for nc" '
+  head -1 <nc_statusp
+'
+
+test_expect_success "can make http request against dns resolved nc server" '
+  ipfs cat /ipfs/Qmabcdef --api /dns4/localhost/tcp/5006 &
+  IPFSPID=$!
+
+  head -1 <nc_statusp &&
+
+  # handle request
+  while read line; do
+    if [[ "$line" == "$(echo -e "\r")" ]]; then
+      break
+    fi
+    echo "$line"
+  done <&7 >nc_out &&
+
+  echo -e "HTTP/1.1 200 OK\r" >&6 &&
+  echo -e "Content-Type: text/plain\r" >&6 &&
+  echo -e "Content-Length: 0\r" >&6 &&
+  echo -e "\r" >&6 &&
+  exec 6<&- &&
+
+  # Wait for IPFS and netcat
+  wait $IPFSPID $NCPID
 '
 
 test_expect_success "request was received by local nc server" '