From 1518873988e4c51bfb025ae584ec24b0846e7e96 Mon Sep 17 00:00:00 2001 From: Overbool Date: Fri, 28 Sep 2018 08:20:08 +0800 Subject: [PATCH] fix(p2p): add test for issue #5523 ;wq Signed-off-by: Overbool License: MIT Signed-off-by: Overbool --- core/commands/p2p.go | 2 +- test/sharness/t0180-p2p.sh | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/core/commands/p2p.go b/core/commands/p2p.go index 60a71a7a048d..3b145a5d3423 100644 --- a/core/commands/p2p.go +++ b/core/commands/p2p.go @@ -230,7 +230,7 @@ func checkPort(target ma.Multiaddr) error { } if port == 0 { - return fmt.Errorf("port can't be 0") + return fmt.Errorf("port can not be 0") } return nil diff --git a/test/sharness/t0180-p2p.sh b/test/sharness/t0180-p2p.sh index 544cd1f6f6a9..d8b5c7e60f08 100755 --- a/test/sharness/t0180-p2p.sh +++ b/test/sharness/t0180-p2p.sh @@ -6,7 +6,7 @@ test_description="Test experimental p2p commands" # start iptb + wait for peering test_expect_success 'init iptb' ' - iptb init -n 2 --bootstrap=none --port=0 + iptb init -n 3 --bootstrap=none --port=0 ' test_expect_success 'generate test data' ' @@ -14,7 +14,7 @@ test_expect_success 'generate test data' ' echo "012345" > test1.bin ' -startup_cluster 2 +startup_cluster 3 test_expect_success 'peer ids' ' PEERID_0=$(iptb get id 0) && @@ -36,6 +36,7 @@ test_expect_success 'fail without config option being enabled' ' test_expect_success "enable filestore config setting" ' ipfsi 0 config --json Experimental.Libp2pStreamMounting true ipfsi 1 config --json Experimental.Libp2pStreamMounting true + ipfsi 2 config --json Experimental.Libp2pStreamMounting true ' test_expect_success 'start p2p listener' ' @@ -129,6 +130,23 @@ test_expect_success 'C->S Close local listener' ' check_test_ports +# Checking port + +test_expect_success "cannot accept 0 port in 'ipfs p2p listen'" ' + test_must_fail ipfsi 2 p2p listen /x/p2p-test/0 /ip4/127.0.0.1/tcp/0 +' + +test_expect_success "'ipfs p2p forward' accept 0 port" ' + ipfsi 2 p2p forward /x/p2p-test/0 /ip4/127.0.0.1/tcp/0 /ipfs/$PEERID_0 +' + +test_expect_success "'ipfs p2p ls' output looks good" ' + echo "true" > forward_0_expected && + ipfsi 2 p2p ls | awk '\''{print $2}'\'' | sed "s/.*\///" | awk -F: '\''{if($1>0)print"true"}'\'' > forward_0_actual && + ipfsi 2 p2p close -p /x/p2p-test/0 && + test_cmp forward_0_expected forward_0_actual +' + # Listing streams test_expect_success "'ipfs p2p ls' succeeds" '