From 6b8e9f51fe1566293a5a795b1c331cb4acfa17d9 Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Fri, 26 Jun 2015 23:22:40 -0700
Subject: [PATCH] fix t0061-daemon-opts.sh nc wait

fix the nc wait. the issue was that stdin needs to remain _open_
but not receive any input for some time. If stdin receives (invalid)
input or closes, the other side terminates the connection before
writing out the muxer frames + identify handshake.

This commit also changes the use of `!` for `test_must_fail`

License: MIT
Signed-off-by: Juan Batiz-Benet <juan@benet.ai>
---
 test/sharness/t0060-daemon.sh      | 7 +++----
 test/sharness/t0061-daemon-opts.sh | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/test/sharness/t0060-daemon.sh b/test/sharness/t0060-daemon.sh
index a81d2c9f3..13a56fc1c 100755
--- a/test/sharness/t0060-daemon.sh
+++ b/test/sharness/t0060-daemon.sh
@@ -19,7 +19,7 @@ test_expect_success "setup IPFS_PATH" '
 # NOTE: this should remove bootstrap peers (needs a flag)
 # TODO(cryptix):
 #  - we won't see daemon startup failure because we put the daemon in the background - fix: fork with exit code after api listen
-#  - also default ports: might clash with local clients. Failure in that case isn't clear as well because pollEndpoint just uses the already running node 
+#  - also default ports: might clash with local clients. Failure in that case isn't clear as well because pollEndpoint just uses the already running node
 test_expect_success "ipfs daemon --init launches" '
   ipfs daemon --init >actual_daemon 2>daemon_err &
 '
@@ -102,10 +102,9 @@ test_expect_success "ipfs help output looks good" '
 # check transport is encrypted
 
 test_expect_success 'transport should be encrypted' '
-  nc localhost 4001 >swarmnc &
-  go-sleep 0.1s &&
+  nc -w 5 localhost 4001 >swarmnc &&
   grep -q "AES-256,AES-128" swarmnc &&
-  ! grep -q "/ipfs/identify" swarmnc ||
+  test_must_fail grep -q "/ipfs/identify" swarmnc ||
 	test_fsh cat swarmnc
 '
 
diff --git a/test/sharness/t0061-daemon-opts.sh b/test/sharness/t0061-daemon-opts.sh
index d01fb8c80..549fa3e8f 100755
--- a/test/sharness/t0061-daemon-opts.sh
+++ b/test/sharness/t0061-daemon-opts.sh
@@ -26,10 +26,9 @@ test_expect_success 'api gateway should be unrestricted' '
 '
 
 # Odd. this fails here, but the inverse works on t0060-daemon.
-test_expect_failure 'transport should be unencrypted' '
-  nc 127.0.0.1 "$PORT_SWARM" >swarmnc &
-  go-sleep 0.1s &&
-  ! grep -q "AES-256,AES-128" swarmnc &&
+test_expect_success 'transport should be unencrypted' '
+  go-sleep 0.5s | nc localhost "$PORT_SWARM" >swarmnc &&
+  test_must_fail grep -q "AES-256,AES-128" swarmnc &&
   grep -q "/ipfs/identify" swarmnc ||
   test_fsh cat swarmnc
 '
-- 
GitLab