fix(tests): when set -e the error raised first then pipe

pingcap · Nov 24, 2020 · 4e5f4e9 · 4e5f4e9
1 parent 5c2f7cd
commit 4e5f4e9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/tests/tiup-cluster/script/cmd_subtest.sh b/tests/tiup-cluster/script/cmd_subtest.sh
@@ -108,6 +108,6 @@ function cmd_subtest() {
     tiup-cluster $client --yes destroy $name
 
     # after destroy the cluster, the public key should be deleted
-    ssh -o "StrictHostKeyChecking=no" -o "PasswordAuthentication=no" -i "/tmp/$name.id_rsa" tidb@$ipprefix.102 "ls" 2>&1 | grep "Permission denied"
+    ! ssh -o "StrictHostKeyChecking=no" -o "PasswordAuthentication=no" -i "/tmp/$name.id_rsa" tidb@$ipprefix.101 "ls"
     unlink "/tmp/$name.id_rsa"
 }
diff --git a/tests/tiup-cluster/script/scale_core.sh b/tests/tiup-cluster/script/scale_core.sh
@@ -79,7 +79,7 @@ function scale_core() {
     ! tiup-cluster $client exec $name -N $ipprefix.102 --command "ps aux | grep node_exporter | grep -qv grep"
     ! tiup-cluster $client exec $name -N $ipprefix.102 --command "ps aux | grep blackbox_exporter | grep -qv grep"
     # after all components on the node were scale-ined, the SSH public is automatically deleted
-    ssh -o "StrictHostKeyChecking=no "-o "PasswordAuthentication=no" -i ~/.tiup/storage/cluster/$name/ssh/id_rsa tidb@$ipprefix.102 "ls" 2>&1 | grep "Permission denied"
+    ! ssh -o "StrictHostKeyChecking=no "-o "PasswordAuthentication=no" -i ~/.tiup/storage/cluster/$name/ssh/id_rsa tidb@$ipprefix.102 "ls"
 
     echo "start scale out tidb"
     topo=./topo/full_scale_in_tidb.yaml

diff --git a/tests/tiup-dm/test_cmd.sh b/tests/tiup-dm/test_cmd.sh
@@ -80,5 +80,5 @@ cp ~/.tiup/storage/dm/clusters/$name/ssh/id_rsa "/tmp/$name.id_rsa"
 tiup-dm --yes destroy $name
 
 # after destroy the cluster, the public key should be deleted
-ssh -o "StrictHostKeyChecking=no" -o "PasswordAuthentication=no" -i "/tmp/$name.id_rsa" tidb@$ipprefix.102 "ls" 2>&1 | grep "Permission denied"
+! ssh -o "StrictHostKeyChecking=no" -o "PasswordAuthentication=no" -i "/tmp/$name.id_rsa" tidb@$ipprefix.102 "ls"
 unlink "/tmp/$name.id_rsa"