From 61e56d61b000b88f580286fab2e259ec392770a7 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Mon, 26 Jun 2017 14:35:14 +0200
Subject: [PATCH] Clean up cli tests to remove expected error messages

---
 tests/cli/basictx.sh | 2 +-
 tests/cli/common.sh  | 2 +-
 tests/cli/counter.sh | 4 ++--
 tests/cli/ibc.sh     | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/cli/basictx.sh b/tests/cli/basictx.sh
index 58f27ceba7..05be85912b 100755
--- a/tests/cli/basictx.sh
+++ b/tests/cli/basictx.sh
@@ -23,7 +23,7 @@ test00GetAccount() {
 
   checkAccount $SENDER "0" "9007199254740992"
 
-  ACCT2=$(${CLIENT_EXE} query account $RECV)
+  ACCT2=$(${CLIENT_EXE} query account $RECV 2>/dev/null)
   assertFalse "has no genesis account" $?
 }
 
diff --git a/tests/cli/common.sh b/tests/cli/common.sh
index 576bef0a48..8d7afd185e 100644
--- a/tests/cli/common.sh
+++ b/tests/cli/common.sh
@@ -127,7 +127,7 @@ getAddr() {
 checkAccount() {
   # make sure sender goes down
   ACCT=$(${CLIENT_EXE} query account $1)
-  if ! assertTrue "account must exist: $ACCT" $?; then
+  if ! assertTrue "account must exist" $?; then
     return 1
   fi
 
diff --git a/tests/cli/counter.sh b/tests/cli/counter.sh
index 28ade7466c..1b8492df52 100755
--- a/tests/cli/counter.sh
+++ b/tests/cli/counter.sh
@@ -23,7 +23,7 @@ test00GetAccount() {
 
   checkAccount $SENDER "0" "9007199254740992"
 
-  ACCT2=$(${CLIENT_EXE} query account $RECV)
+  ACCT2=$(${CLIENT_EXE} query account $RECV 2>/dev/null)
   assertFalse "has no genesis account" $?
 }
 
@@ -46,7 +46,7 @@ test01SendTx() {
 }
 
 test02GetCounter() {
-  COUNT=$(${CLIENT_EXE} query counter)
+  COUNT=$(${CLIENT_EXE} query counter 2>/dev/null)
   assertFalse "no default count" $?
 }
 
diff --git a/tests/cli/ibc.sh b/tests/cli/ibc.sh
index 9819f5d87d..ba2fcc9d79 100755
--- a/tests/cli/ibc.sh
+++ b/tests/cli/ibc.sh
@@ -66,16 +66,16 @@ test00GetAccount() {
   RECV_1=$(BC_HOME=${CLIENT_1} getAddr $POOR)
   export BC_HOME=${CLIENT_1}
 
-  assertFalse "requires arg" "${CLIENT_EXE} query account"
-  assertFalse "has no genesis account" "${CLIENT_EXE} query account $RECV_1"
+  assertFalse "requires arg" "${CLIENT_EXE} query account 2>/dev/null"
+  assertFalse "has no genesis account" "${CLIENT_EXE} query account $RECV_1 2>/dev/null"
   checkAccount $SENDER_1 "0" "9007199254740992"
 
   export BC_HOME=${CLIENT_2}
   SENDER_2=$(getAddr $RICH)
   RECV_2=$(getAddr $POOR)
 
-  assertFalse "requires arg" "${CLIENT_EXE} query account"
-  assertFalse "has no genesis account" "${CLIENT_EXE} query account $RECV_2"
+  assertFalse "requires arg" "${CLIENT_EXE} query account 2>/dev/null"
+  assertFalse "has no genesis account" "${CLIENT_EXE} query account $RECV_2 2>/dev/null"
   checkAccount $SENDER_2 "0" "9007199254740992"
 
   # Make sure that they have different addresses on both chains (they are random keys)