RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-11 04:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13257 from tchaikov/wip-less-verbose-ceph-helper

Browse Source 
tests: ceph-helpers.sh reduce get_timeout_delays() verbosity

Reviewed-by: Loic Dachary <ldachary@redhat.com>
This commit is contained in:
Kefu Chai 2017-02-04 20:15:34 +08:00 committed by GitHub
commit 6cd8098a61
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qa/workunits/ceph-helpers.sh
View File

@ -1085,8 +1085,8 @@ function test_is_clean() {
# @return a list of sleep delays # @return a list of sleep delays
# #
function get_timeout_delays() { function get_timeout_delays() {
local saved_state=$(set +o) local trace=$(shopt -q -o xtrace && echo true || echo false)
set +x $trace && shopt -u -o xtrace
local timeout=$1 local timeout=$1
local first_step=${2:-1} local first_step=${2:-1}
@ -1101,7 +1101,7 @@ function get_timeout_delays() {
if test "$(echo $total \< $timeout | bc -l)" = "1"; then if test "$(echo $total \< $timeout | bc -l)" = "1"; then
echo -n $(echo $timeout - $total | bc -l) echo -n $(echo $timeout - $total | bc -l)
fi fi
eval "$saved_state" $trace && shopt -s -o xtrace
} }
function test_get_timeout_delays() { function test_get_timeout_delays() {