From 9e599d2571a62cabf05ae2ec05ce136b7e6a5a00 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 6 Sep 2017 08:20:31 -0500
Subject: [PATCH] #271 - Add check for return code

---
 tests/eosd_run_test.sh | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/tests/eosd_run_test.sh b/tests/eosd_run_test.sh
index 9bef51054..eb6f88847 100755
--- a/tests/eosd_run_test.sh
+++ b/tests/eosd_run_test.sh
@@ -2,12 +2,19 @@
 
 error()
 {
-  echo $1
-  kill -9
+  (>&2 echo $1)
   cleanup
   exit 1
 }
 
+verifyErrorCode()
+{
+  rc=$?
+  if [[ $rc != 0 ]]; then
+    error "$1 returned error code $rc"
+  fi
+}
+
 cleanup()
 {
   programs/launcher/launcher -k 9
@@ -20,6 +27,7 @@ INITA_PRV_KEY="5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
 
 # eosd
 programs/launcher/launcher -p 1
+verifyErrorCode "launcher"
 sleep 9
 count=`grep -c "generated block" tn_data_0/stderr.txt`
 if [ $count == 0 ]; then
@@ -28,9 +36,11 @@ fi
 
 # create 2 keys
 KEYS="$(programs/eosc/eosc create key)"
+verifyErrorCode "eosc create key"
 PRV_KEY1="$(echo "$KEYS" | awk '/Private/ {print $3}')"
 PUB_KEY1="$(echo "$KEYS" | awk '/Public/ {print $3}')"
 KEYS="$(programs/eosc/eosc create key)"
+verifyErrorCode "eosc create key"
 PRV_KEY2="$(echo "$KEYS" | awk '/Private/ {print $3}')"
 PUB_KEY2="$(echo "$KEYS" | awk '/Public/ {print $3}')"
 if [ -z "$PRV_KEY1" ] || [ -z "$PRV_KEY2" ] || [ -z "$PUB_KEY1" ] || [ -z "$PUB_KEY2" ]; then
@@ -39,20 +49,27 @@ fi
 
 # walletd
 programs/eos-walletd/eos-walletd --data-dir tn_wallet_0 --http-server-endpoint=127.0.0.1:8899 > test_walletd_output.log 2>&1 &
+verifyErrorCode "eos-walletd"
 WALLETD_PROC_ID=$!
 sleep 3
 
 # import into a wallet
 PASSWORD="$(programs/eosc/eosc --wallet-port 8899 wallet create --name test)"
+verifyErrorCode "eosc wallet create"
 programs/eosc/eosc --wallet-port 8899 wallet import --name test $PRV_KEY1
+verifyErrorCode "eosc wallet import"
 programs/eosc/eosc --wallet-port 8899 wallet import --name test $PRV_KEY2
+verifyErrorCode "eosc wallet import"
 programs/eosc/eosc --wallet-port 8899 wallet import --name test $INITA_PRV_KEY
+verifyErrorCode "eosc wallet import"
 
 # create new account
 programs/eosc/eosc --wallet-port 8899 create account inita tester $PUB_KEY1 $PUB_KEY2
+verifyErrorCode "eosc create account"
 
 # verify account created
 ACCOUNT_INFO="$(programs/eosc/eosc --wallet-port 8899 get account tester)"
+verifyErrorCode "eosc get account"
 count=`echo $ACCOUNT_INFO | grep -c "exception"`
 if [ $count != 0 ]; then
   error "FAILURE - account creation caused exception: $ACCOUNT_INFO"
@@ -64,6 +81,7 @@ fi
 
 # transfer
 programs/eosc/eosc --wallet-port 8899 transfer inita tester 975321 "test transfer"
+verifyErrorCode "eosc transfer"
 
 # verify transfer
 ACCOUNT_INFO="$(programs/eosc/eosc --wallet-port 8899 get account tester)"
-- 
GitLab