Browse Source

circle sigh

pull/426/head
Ethan Buchman 8 years ago
parent
commit
8352ec4e5d
3 changed files with 33 additions and 30 deletions
  1. +5
    -2
      test/persist/test_failure_indices.sh
  2. +10
    -10
      test/run_test.sh
  3. +18
    -18
      test/test.sh

+ 5
- 2
test/persist/test_failure_indices.sh View File

@ -45,8 +45,11 @@ function kill_procs(){
wait "$PID_TENDERMINT"
# wait for the ports to be released
#wait_for_port 46656
#wait_for_port 46657
wait_for_port 46656
wait_for_port 46657
# XXX: sometimes the port is still bound :(
sleep 2
}
# wait for port to be available


+ 10
- 10
test/run_test.sh View File

@ -6,17 +6,17 @@ pwd
BRANCH=$(git rev-parse --abbrev-ref HEAD)
echo "Current branch: $BRANCH"
#bash test/test_cover.sh
#
## run the app tests
#bash test/app/test.sh
bash test/test_cover.sh
# run the app tests
bash test/app/test.sh
# run the persistence test
bash test/persist/test.sh
#if [[ "$BRANCH" == "master" || $(echo "$BRANCH" | grep "release-") != "" ]]; then
# echo ""
# echo "* branch $BRANCH; testing libs"
# # checkout every github.com/tendermint dir and run its tests
# bash test/test_libs.sh
#fi
if [[ "$BRANCH" == "master" || $(echo "$BRANCH" | grep "release-") != "" ]]; then
echo ""
echo "* branch $BRANCH; testing libs"
# checkout every github.com/tendermint dir and run its tests
bash test/test_libs.sh
fi

+ 18
- 18
test/test.sh View File

@ -35,21 +35,21 @@ else
docker run --name run_test -t tester bash test/run_test.sh
fi
## copy the coverage results out of docker container
#docker cp run_test:/go/src/github.com/tendermint/tendermint/coverage.txt .
#
## test basic network connectivity
## by starting a local testnet and checking peers connect and make blocks
#echo
#echo "* [$(date +"%T")] running p2p tests on a local docker network"
#bash "$DIR/p2p/test.sh" tester
#
## only run the cloud benchmark for releases
#BRANCH=$(git rev-parse --abbrev-ref HEAD)
#if [[ $(echo "$BRANCH" | grep "release-") != "" ]]; then
# echo
# echo "TODO: run network tests"
# #echo "* branch $BRANCH; running mintnet/netmon throughput benchmark"
# # TODO: replace mintnet
# #bash "$DIR/net/test.sh"
#fi
# copy the coverage results out of docker container
docker cp run_test:/go/src/github.com/tendermint/tendermint/coverage.txt .
# test basic network connectivity
# by starting a local testnet and checking peers connect and make blocks
echo
echo "* [$(date +"%T")] running p2p tests on a local docker network"
bash "$DIR/p2p/test.sh" tester
# only run the cloud benchmark for releases
BRANCH=$(git rev-parse --abbrev-ref HEAD)
if [[ $(echo "$BRANCH" | grep "release-") != "" ]]; then
echo
echo "TODO: run network tests"
#echo "* branch $BRANCH; running mintnet/netmon throughput benchmark"
# TODO: replace mintnet
#bash "$DIR/net/test.sh"
fi

Loading…
Cancel
Save