]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: disable the echo when running get_timeout_delays() 12180/head
authorKefu Chai <kchai@redhat.com>
Thu, 24 Nov 2016 16:12:57 +0000 (00:12 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 24 Nov 2016 16:17:23 +0000 (00:17 +0800)
this function is very distracting when one is looking at the log

Signed-off-by: Kefu Chai <kchai@redhat.com>
qa/workunits/ceph-helpers.sh

index ba73e91311540d9aafc1b4b6287bbd2fdfc3b53f..9922bc128a4f6d514a10626e98a9a67650577e06 100755 (executable)
@@ -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() {