Merge branch 'master' into develop_old

.codecov.yml

@@ -0,0 +1,24 @@
+
+#
+# This codecov.yml is the default configuration for
+# all repositories on Codecov. You may adjust the settings
+# below in your own codecov.yml in your repository.
+#
+coverage:
+  precision: 2
+  round: down
+  range: 70...100
+
+  status:
+    # Learn more at https://codecov.io/docs#yaml_default_commit_status
+    project: 
+      default:
+        threshold: 1% # allow this much decrease on project
+    patch: 
+      default:
+        threshold: 50% # allow this much decrease on patch
+    changes: false
+
+comment:
+  layout: "header, diff"
+  behavior: default  # update if exists else create new

test/net/test.sh

@@ -20,7 +20,12 @@ set -u
 export TMHEAD=`git rev-parse --abbrev-ref HEAD`
 export TM_IMAGE="tendermint/tmbase"
 
+# grab glide for dependency mgmt
+go get github.com/Masterminds/glide
+
 # grab network monitor, install mintnet, netmon
+# these might err 
+echo "... fetching repos. ignore go get errors"
 set +e
 go get github.com/tendermint/network_testing
 go get github.com/tendermint/mintnet
@@ -28,20 +33,26 @@ go get github.com/tendermint/netmon
 set -e
 
 # install vendored deps
+echo "GOPATH $GOPATH"
+
 cd $GOPATH/src/github.com/tendermint/mintnet
+echo "... install mintnet dir $(pwd)"
 glide install
 go install
 cd $GOPATH/src/github.com/tendermint/netmon
+echo "... install netmon dir $(pwd)"
 glide install
 go install
 
 cd $GOPATH/src/github.com/tendermint/network_testing
+echo "... running network test $(pwd)"
 bash experiments/exp_throughput.sh $DATACENTER $VALSETSIZE $BLOCKSIZE $TX_SIZE $NTXS $MACH_PREFIX $RESULTSDIR $CLOUD_PROVIDER
 
 # TODO: publish result!
 
 # cleanup
 
+echo "... destroying machines"
 mintnet destroy --machines $MACH_PREFIX[1-$VALSETSIZE] 
 
 

test/test.sh

@@ -8,19 +8,19 @@ echo ""
 echo "* building docker image"
 bash ./test/docker/build.sh
 
-#echo ""
-#echo "* running go tests and app tests in docker container"
-#docker run --name run_test -t tester bash test/run_test.sh
-#
-## 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 "* running p2p tests on a local docker network"
-#bash test/p2p/test.sh tester
-#
+echo ""
+echo "* running go tests and app tests in docker container"
+docker run --name run_test -t tester bash test/run_test.sh
+
+# 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 "* running p2p tests on a local docker network"
+bash test/p2p/test.sh tester
+
 # only run the cloud benchmark for releases
 BRANCH=`git rev-parse --abbrev-ref HEAD`
 if [[ $(echo "$BRANCH" | grep "release-") != "" ]]; then