test: split up test/net/test.sh

test/net/setup.sh

@@ -0,0 +1,26 @@
+#! /bin/bash
+set -eu
+
+# 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
+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

test/net/start.sh

@@ -0,0 +1,34 @@
+#! /bin/bash
+set -eu
+
+# start a testnet and benchmark throughput using mintnet+netmon via the network_testing repo
+
+DATACENTER=single
+VALSETSIZE=4
+BLOCKSIZE=8092
+TX_SIZE=200
+NTXS=$((BLOCKSIZE*4))
+RESULTSDIR=results
+CLOUD_PROVIDER=digitalocean
+
+set +u
+if [[ "$MACH_PREFIX" == "" ]]; then
+	MACH_PREFIX=mach
+fi
+set -u
+
+export TMHEAD=`git rev-parse --abbrev-ref HEAD`
+export TM_IMAGE="tendermint/tmbase"
+
+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/net/test.sh

@@ -1,58 +1,8 @@
 #! /bin/bash
 set -eu
 
-# start a testnet and benchmark throughput using mintnet+netmon via the network_testing repo
-
-DATACENTER=single
-VALSETSIZE=4
-BLOCKSIZE=8092
-TX_SIZE=200
-NTXS=$((BLOCKSIZE*4))
-RESULTSDIR=results
-CLOUD_PROVIDER=digitalocean
-
-set +u
-if [[ "$MACH_PREFIX" == "" ]]; then
-	MACH_PREFIX=mach
-fi
-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
-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] 
-
+# install mintnet, netmon, fetch network_testing
+bash test/net/setup.sh
 
+# start the testnet
+bash test/net/start.sh

test/test.sh

@@ -27,6 +27,8 @@ bash test/p2p/test.sh tester
 BRANCH=`git rev-parse --abbrev-ref HEAD`
 if [[ $(echo "$BRANCH" | grep "release-") != "" ]]; then
 	echo ""
-	echo "* branch $BRANCH; running mintnet/netmon throughput benchmark"
-	bash test/net/test.sh
+	echo "TODO: run network tests"
+	#echo "* branch $BRANCH; running mintnet/netmon throughput benchmark"
+	# TODO: replace mintnet 
+	#bash test/net/test.sh
 fi