certusone
/
tendermint
mirror of https://github.com/certusone/tendermint.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix bash tests

This commit is contained in:
Ethan Buchman 2018-01-18 17:40:12 -05:00
parent 620c957a44
commit f57f97c4bd
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/p2p/pex/dial_persistent_peers.sh → test/p2p/pex/dial_peers.sh
View File

@ -19,13 +19,14 @@ for i in `seq 1 $N`; do
done
set -e
# persistent_peers need quotes
persistent_peers="\"$(test/p2p/ip.sh 1):46656\""
# peers need quotes
peers="\"$(test/p2p/ip.sh 1):46656\""
for i in `seq 2 $N`; do
persistent_peers="$persistent_peers,\"$(test/p2p/ip.sh $i):46656\""
peers="$peers,\"$(test/p2p/ip.sh $i):46656\""
done
echo $persistent_peers
echo $peers
echo $persistent_peers
echo $peers
IP=$(test/p2p/ip.sh 1)
curl --data-urlencode "persistent_peers=[$persistent_peers]" "$IP:46657/dial_persistent_peers"
curl "$IP:46657/dial_peers?persistent=true&peers=\[$peers\]"

4
test/p2p/pex/test.sh
View File

@ -11,5 +11,5 @@ cd "$GOPATH/src/github.com/tendermint/tendermint"
echo "Test reconnecting from the address book"
bash test/p2p/pex/test_addrbook.sh "$DOCKER_IMAGE" "$NETWORK_NAME" "$N" "$PROXY_APP"
echo "Test connecting via /dial_persistent_peers"
bash test/p2p/pex/test_dial_persistent_peers.sh "$DOCKER_IMAGE" "$NETWORK_NAME" "$N" "$PROXY_APP"
echo "Test connecting via /dial_peers"
bash test/p2p/pex/test_dial_peers.sh "$DOCKER_IMAGE" "$NETWORK_NAME" "$N" "$PROXY_APP"

10
test/p2p/pex/test_dial_persistent_peers.sh → test/p2p/pex/test_dial_peers.sh
View File

@ -11,7 +11,7 @@ ID=1
cd $GOPATH/src/github.com/tendermint/tendermint
echo "----------------------------------------------------------------------"
echo "Testing full network connection using one /dial_persistent_peers call"
echo "Testing full network connection using one /dial_peers call"
echo "(assuming peers are started with pex enabled)"
# stop the existing testnet and remove local network
@ -26,11 +26,11 @@ bash test/p2p/local_testnet_start.sh $DOCKER_IMAGE $NETWORK_NAME $N $PROXY_APP $
# dial persistent_peers from one node
CLIENT_NAME="dial_persistent_peers"
bash test/p2p/client.sh $DOCKER_IMAGE $NETWORK_NAME $CLIENT_NAME "test/p2p/pex/dial_persistent_peers.sh $N"
# dial peers from one node
CLIENT_NAME="dial_peers"
bash test/p2p/client.sh $DOCKER_IMAGE $NETWORK_NAME $CLIENT_NAME "test/p2p/pex/dial_peers.sh $N"
# test basic connectivity and consensus
# start client container and check the num peers and height for all nodes
CLIENT_NAME="dial_persistent_peers_basic"
CLIENT_NAME="dial_peers_basic"
bash test/p2p/client.sh $DOCKER_IMAGE $NETWORK_NAME $CLIENT_NAME "test/p2p/basic/test.sh $N"