Skip to content

Commit

Permalink
fix(p2p): add test for issue #5523
Browse files Browse the repository at this point in the history
;wq
Signed-off-by: Overbool <overbool.xu@gmail.com>

License: MIT
Signed-off-by: Overbool <overbool.xu@gmail.com>
  • Loading branch information
overbool committed Sep 29, 2018
1 parent d3e653e commit 1518873
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
2 changes: 1 addition & 1 deletion core/commands/p2p.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 20 additions & 2 deletions test/sharness/t0180-p2p.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ 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' '
echo "ABCDEF" > test0.bin &&
echo "012345" > test1.bin
'

startup_cluster 2
startup_cluster 3

test_expect_success 'peer ids' '
PEERID_0=$(iptb get id 0) &&
Expand All @@ -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' '
Expand Down Expand Up @@ -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" '
Expand Down

0 comments on commit 1518873

Please sign in to comment.