test: more cleanup on p2p

This commit is contained in:
Ethan Buchman
2016-12-12 16:00:21 -05:00
parent d800a51da4
commit bcd8712ec3
7 changed files with 119 additions and 71 deletions
@@ -2,15 +2,14 @@
set -eu
set -o pipefail
###############################################################
# for each peer:
# kill peer
# bring it back online via fast sync
# check app hash
###############################################################
ID=$1
###########################################
#
# Wait for peer to catchup to other peers
#
###########################################
addr=$(test/p2p/ip.sh $ID):46657
peerID=$(( $(($ID % 4)) + 1 )) # 1->2 ... 3->4 ... 4->1
peer_addr=$(test/p2p/ip.sh $peerID):46657
+5 -18
View File
@@ -3,26 +3,13 @@ set -eu
DOCKER_IMAGE=$1
NETWORK_NAME=$2
COUNT=$3
N=$4
N=$3
echo "Testing fasysync on node $COUNT"
cd $GOPATH/src/github.com/tendermint/tendermint
# kill peer
set +e # circle sigh :(
docker rm -vf local_testnet_$COUNT
set -e
# restart peer - should have an empty blockchain
SEEDS="$(test/p2p/ip.sh 1):46656"
for j in `seq 2 $N`; do
SEEDS="$SEEDS,$(test/p2p/ip.sh $j):46656"
# run it on each of them
for i in `seq 1 $N`; do
bash test/p2p/fast_sync/test_peer.sh $DOCKER_IMAGE $NETWORK_NAME $i $N
done
bash test/p2p/peer.sh $DOCKER_IMAGE $NETWORK_NAME $COUNT $SEEDS
bash test/p2p/client.sh $DOCKER_IMAGE $NETWORK_NAME fs_$COUNT "test/p2p/fast_sync/restart_peer.sh $COUNT"
echo ""
echo "PASS"
echo ""
+37
View File
@@ -0,0 +1,37 @@
#! /bin/bash
set -eu
DOCKER_IMAGE=$1
NETWORK_NAME=$2
COUNT=$3
N=$4
###############################################################
# this runs on each peer:
# kill peer
# bring it back online via fast sync
# wait for it to sync and check the app hash
###############################################################
echo "Testing fasysync on node $COUNT"
# kill peer
set +e # circle sigh :(
docker rm -vf local_testnet_$COUNT
set -e
# restart peer - should have an empty blockchain
SEEDS="$(test/p2p/ip.sh 1):46656"
for j in `seq 2 $N`; do
SEEDS="$SEEDS,$(test/p2p/ip.sh $j):46656"
done
bash test/p2p/peer.sh $DOCKER_IMAGE $NETWORK_NAME $COUNT $SEEDS
# wait for peer to sync and check the app hash
bash test/p2p/client.sh $DOCKER_IMAGE $NETWORK_NAME fs_$COUNT "test/p2p/fast_sync/check_peer.sh $COUNT"
echo ""
echo "PASS"
echo ""