Merge remote-tracking branch 'origin/test_bw_rpc' into test_bw_rpc

build/dapp-test-common.sh

@@ -106,7 +106,7 @@ chain33_ImportPrivkey() {
 
     local req='"method":"Chain33.ImportPrivkey", "params":[{"privkey":"'"$pri"'", "label":"'"$label"'"}]'
     resp=$(curl -ksd "{$req}" "$MAIN_HTTP")
-    ok=$(jq '(((.error|not) and (.result.label=="'"$label"'") and (.result.acc.addr == "'"$acc"'")) or (.error=="ErrPrivkeyExist"))' <<<"$resp")
+    ok=$(jq '(.error|not) and (.result.label=="'"$label"'") and (.result.acc.addr == "'"$acc"'")' <<<"$resp")
 
     [ "$ok" == true ]
 }
@@ -154,4 +154,5 @@ chain33_QueryExecBalance() {
 chain33_GetAccounts() {
     resp=$(curl -ksd '{"jsonrpc":"2.0","id":2,"method":"Chain33.GetAccounts","params":[{}]}' -H 'content-type:text/plain;' ${MAIN_HTTP})
     echo "$resp"
-}
\ No newline at end of file
+}
+