From 8352ec4e5ddcf24bf731c3139bc7fb68add0bb9d Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Fri, 3 Mar 2017 19:58:17 -0500
Subject: [PATCH] circle sigh

---
 test/persist/test_failure_indices.sh |  7 ++++--
 test/run_test.sh                     | 20 ++++++++--------
 test/test.sh                         | 36 ++++++++++++++--------------
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/test/persist/test_failure_indices.sh b/test/persist/test_failure_indices.sh
index 04118c728..0d0b3b2b7 100644
--- a/test/persist/test_failure_indices.sh
+++ b/test/persist/test_failure_indices.sh
@@ -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
diff --git a/test/run_test.sh b/test/run_test.sh
index 4bf69ed72..fcc82d984 100644
--- a/test/run_test.sh
+++ b/test/run_test.sh
@@ -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
diff --git a/test/test.sh b/test/test.sh
index d90fb68de..1c1faca20 100644
--- a/test/test.sh
+++ b/test/test.sh
@@ -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