From 2b48daaebadd5ce2001e28b7626e3c6f2e5fe3d4 Mon Sep 17 00:00:00 2001 From: Rob Walker Date: Thu, 16 Aug 2018 14:33:14 -0700 Subject: [PATCH] accept multiple expected outputs --- multinode-demo/test/wallet-sanity.sh | 29 ++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/multinode-demo/test/wallet-sanity.sh b/multinode-demo/test/wallet-sanity.sh index 2733c85f2..8a77cbe00 100755 --- a/multinode-demo/test/wallet-sanity.sh +++ b/multinode-demo/test/wallet-sanity.sh @@ -18,13 +18,26 @@ fi garbage_address=vS3ngn1TfQmpsW1Z4NkLuqNAQFF3dYQw8UZ6TCx9bmq check_balance_output() { - declare expected_output="$1" - exec 42>&1 - output=$($wallet balance | tee >(cat - >&42)) - if [[ ! "$output" =~ $expected_output ]]; then - echo "Balance is incorrect. Expected: $expected_output" - exit 1 - fi + # TODO go back to a single expected_output once snaps and wallet + # are in sync + # + # declare expected_output="$1" + # exec 42>&1 + # output=$($wallet balance | tee >(cat - >&42)) + # if [[ ! "$output" =~ $expected_output ]]; then + # echo "Balance is incorrect. Expected: $expected_output" + # exit 1 + # fi + exec 42>&1 + output=$($wallet balance | tee >(cat - >&42)) + + for expected_output in "$@"; do + if [[ "$output" =~ $expected_output ]]; then + return 0 + fi + done + echo "Balance is incorrect. Expected: $expected_output" + exit 1 } pay_and_confirm() { @@ -35,7 +48,7 @@ pay_and_confirm() { $wallet reset $wallet address -check_balance_output "No account found" +check_balance_output "No account found" "Your balance is: 0" $wallet airdrop --tokens 60 check_balance_output "Your balance is: 60" $wallet airdrop --tokens 40