Cli tests abort cleaner when server can't start

This commit is contained in:
Ethan Frey 2017-07-06 13:49:02 +02:00
parent 912c24093f
commit 56e61c9431
4 changed files with 13 additions and 7 deletions

View File

@ -8,7 +8,9 @@ RICH=${ACCOUNTS[0]}
POOR=${ACCOUNTS[4]}
oneTimeSetUp() {
quickSetup .basecoin_test_basictx basictx-chain
if ! quickSetup .basecoin_test_basictx basictx-chain; then
exit 1;
fi
}
oneTimeTearDown() {

View File

@ -8,7 +8,9 @@ RICH=${ACCOUNTS[0]}
POOR=${ACCOUNTS[4]}
oneTimeSetUp() {
quickSetup .basecoin_test_counter counter-chain
if ! quickSetup .basecoin_test_counter counter-chain; then
exit 1;
fi
}
oneTimeTearDown() {

View File

@ -37,19 +37,19 @@ oneTimeSetUp() {
# Start basecoin server, giving money to the key in the first client
BC_HOME=${CLIENT_1} initServer $BASE_DIR_1 $CHAIN_ID_1 $PREFIX_1
if [ $? != 0 ]; then return 1; fi
if [ $? != 0 ]; then exit 1; fi
PID_SERVER_1=$PID_SERVER
# Start second basecoin server, giving money to the key in the second client
BC_HOME=${CLIENT_2} initServer $BASE_DIR_2 $CHAIN_ID_2 $PREFIX_2
if [ $? != 0 ]; then return 1; fi
if [ $? != 0 ]; then exit 1; fi
PID_SERVER_2=$PID_SERVER
# Connect both clients
BC_HOME=${CLIENT_1} initClient $CHAIN_ID_1 $PORT_1
if [ $? != 0 ]; then return 1; fi
if [ $? != 0 ]; then exit 1; fi
BC_HOME=${CLIENT_2} initClient $CHAIN_ID_2 $PORT_2
if [ $? != 0 ]; then return 1; fi
if [ $? != 0 ]; then exit 1; fi
printf "...Testing may begin!\n\n\n"
}

View File

@ -8,7 +8,9 @@ RICH=${ACCOUNTS[0]}
POOR=${ACCOUNTS[4]}
oneTimeSetUp() {
quickSetup .basecoin_test_restart restart-chain
if ! quickSetup .basecoin_test_restart restart-chain; then
exit 1;
fi
}
oneTimeTearDown() {