From: Kefu Chai <kchai@redhat.com>
Date: Thu, 24 Nov 2016 16:12:57 +0000 (+0800)
Subject: tests: disable the echo when running get_timeout_delays()
X-Git-Tag: v11.1.0~132^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b9bc0501cfabc2bbbe4cce4a67d49afc7e81214;p=ceph.git

tests: disable the echo when running get_timeout_delays()

this function is very distracting when one is looking at the log

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/qa/workunits/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh
index ba73e91311540..9922bc128a4f6 100755
--- a/qa/workunits/ceph-helpers.sh
+++ b/qa/workunits/ceph-helpers.sh
@@ -1082,6 +1082,8 @@ function test_is_clean() {
 # @return a list of sleep delays
 #
 function get_timeout_delays() {
+    local saved_state=$(set +o)
+    set +x
     local timeout=$1
     local first_step=${2:-1}
 
@@ -1096,6 +1098,7 @@ function get_timeout_delays() {
     if test "$(echo $total \< $timeout | bc -l)" = "1"; then
         echo -n $(echo $timeout - $total | bc -l)
     fi
+    eval "$saved_state"
 }
 
 function test_get_timeout_delays() {