fixup! Scripting improvement

Signed-off-by: michael steiner <[email protected]>

Author: g2flyer

fabric/bin/lib/common_ledger.sh

@@ -182,18 +182,33 @@ ledger_shutdown() {
 
 # Check the chaincode's response (ResponseData) of
 #   peer chaincode invoke/query
-# (executed via 'try_r' macro) against expected result.
+# (executed via 'try_r/try_out_r' macro) against expected result.
 # In case of failures, tries to increment integer variable NUM_FAILURES. Increment in all cases NUM_TESTS
 check_result() {
-    if [[ ${RESPONSE} == "$1" ]]; then
+    if [ "${RESPONSE_TYPE}" == "out+err" ]; then
+	CI_RESPONSE=$(parse_invoke_result_from_log "${RESPONSE}")
+	CONTEXT=" context: '${RESPONSE}'"
+    else
+	CI_RESPONSE="${RESPONSE}"
+	CONTEXT=""
+    fi
+
+    if [[ ${CI_RESPONSE} == "$1" ]]; then
 	gecho "PASSED"
     else
-	recho "FAILED (expected '${1}', got '${RESPONSE}')"
+	recho "FAILED (expected '${1}', got '${CI_RESPONSE}'${CONTEXT})"
         export NUM_FAILURES=$(($NUM_FAILURES+1))
     fi
     export NUM_TESTS=$(($NUM_TESTS+1))
 }
 
+parse_invoke_result_from_log() {
+    RESPONSE="$1"
+    RESPONSE=${RESPONSE##*payload:\"}
+    RESPONSE=${RESPONSE%%\"*}
+    echo "${RESPONSE}"
+}
+
 
 # "Main"
 parse_fabric_config "${FABRIC_CFG_PATH}"

fabric/bin/lib/common_utils.sh

@@ -75,11 +75,11 @@ try_fail() {
 # Variant of try which stores commands stdout and stderr (or only stdout) in variable RESPONSE
 try_r() {
     say "$@"
-    export RESPONSE=$("$@" 2>&1) || die "test failed: $*"
+    export RESPONSE=$("$@" 2>&1) RESPONSE_TYPE="out+err" || die "test failed: $*"
 }
 
 try_out_r() {
     say "$@"
-    export RESPONSE=$("$@") || die "test failed: $*"
+    export RESPONSE=$("$@") RESPONSE_TYPE="out" || die "test failed: $*"
 }
 

fabric/bin/peer.sh

@@ -666,9 +666,9 @@ handle_chaincode_call() {
 	if [ ! -z ${DO_WAIT_TIMEOUT+x} ]; then
 	    opt_arg="--waitForEvent ${opt_arg}"
 	fi
-	try_out_r $RUN ${FABRIC_BIN_DIR}/peer chaincode invoke "${OTHER_ARGS[@]}" ${opt_arg} -C ${CHAN_ID} -n ${CC_ID} -c '{"Args":["__endorse", "'${encrypted_response}'"]}'
-	endorse_response="${RESPONSE}"
-        [ ${endorse_response} == "OK" ] || die "endorsement failed: '${endorse_response}'"
+	try_r $RUN ${FABRIC_BIN_DIR}/peer chaincode invoke "${OTHER_ARGS[@]}" ${opt_arg} -C ${CHAN_ID} -n ${CC_ID} -c '{"Args":["__endorse", "'${encrypted_response}'"]}'
+	endorse_response=$(parse_invoke_result_from_log "${RESPONSE}")
+        [ "${endorse_response}" == "OK" ] || die "endorsement failed: '${endorse_response}'"
         [ -z ${DEBUG+x} ] || say "endorsement returned '${endorse_response}'"
     fi
     # - return decrypted response