opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-02 03:28:25 +08:00
Code Issues Projects Releases Wiki Activity

fix t0061-daemon-opts.sh nc wait

Browse Source 
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>
This commit is contained in:
Juan Batiz-Benet
2015-06-26 23:22:40 -07:00
parent f300e97c50
commit 6b8e9f51fe
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/sharness/t0060-daemon.sh
View File

@ -19,7 +19,7 @@ test_expect_success "setup IPFS_PATH" '
# NOTE: this should remove bootstrap peers (needs a flag) # NOTE: this should remove bootstrap peers (needs a flag)
# TODO(cryptix): # 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 # - 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" ' test_expect_success "ipfs daemon --init launches" '
ipfs daemon --init >actual_daemon 2>daemon_err & ipfs daemon --init >actual_daemon 2>daemon_err &
' '
@ -102,10 +102,9 @@ test_expect_success "ipfs help output looks good" '
# check transport is encrypted # check transport is encrypted
test_expect_success 'transport should be encrypted' ' test_expect_success 'transport should be encrypted' '
nc localhost 4001 >swarmnc & nc -w 5 localhost 4001 >swarmnc &&
go-sleep 0.1s &&
grep -q "AES-256,AES-128" 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 test_fsh cat swarmnc
' '

7
test/sharness/t0061-daemon-opts.sh
View File

@ -26,10 +26,9 @@ test_expect_success 'api gateway should be unrestricted' '
' '
# Odd. this fails here, but the inverse works on t0060-daemon. # Odd. this fails here, but the inverse works on t0060-daemon.
test_expect_failure 'transport should be unencrypted' ' test_expect_success 'transport should be unencrypted' '
nc 127.0.0.1 "$PORT_SWARM" >swarmnc & go-sleep 0.5s | nc localhost "$PORT_SWARM" >swarmnc &&
go-sleep 0.1s && test_must_fail grep -q "AES-256,AES-128" swarmnc &&
! grep -q "AES-256,AES-128" swarmnc &&
grep -q "/ipfs/identify" swarmnc || grep -q "/ipfs/identify" swarmnc ||
test_fsh cat swarmnc test_fsh cat swarmnc
' '