diff --git a/test/sharness/t0235-cli-request.sh b/test/sharness/t0235-cli-request.sh index 42931a2c5..1c9e6151d 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 && mkfifo nc_inp nc_outp + + nc -k -l 127.0.0.1 5005 nc_outp & NCPID=$! - go-sleep 0.5s && kill "$NCPID" & - ipfs cat /ipfs/Qmabcdef --api /ip4/127.0.0.1/tcp/5005 || true + + exec 6>nc_inp 7nc_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 + wait $IPFSPID +' + +test_expect_success "stop nc" ' + kill "$NCPID" && wait "$NCPID" || true ' 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 18aa22460..8397c9822 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 && mkfifo nc_inp nc_outp + + nc -k -l 127.0.0.1 5006 nc_outp & NCPID=$! - go-sleep 1s && kill "$NCPID" & - ipfs cat /ipfs/Qmabcdef --api /dns4/localhost/tcp/5005 || true + + exec 6>nc_inp 7nc_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 + wait $IPFSPID +' + +test_expect_success "stop nc" ' + kill "$NCPID" && wait "$NCPID" || true ' test_expect_success "request was received by local nc server" '