diff options
| author | N Balachandran <nbalacha@redhat.com> | 2015-10-20 22:23:17 +0530 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-10-21 19:47:39 -0700 |
| commit | 594a03b030577bf0ed6960199e920cc5fa7e7afc (patch) | |
| tree | 2c99babdb9efe4604b6deed5f4ff7fd05220b3cf /tests/basic/tier/tier.t | |
| parent | 36974c36fa4231df3f0e9428a9da6d1aa33348ab (diff) | |
tests/tier: Move common functions to tier.rc
Move common functions in tier .t files to tier.rc
Change-Id: Ibc312d987be9d93e7cc7fc47d0bf598bb1c944c2
BUG: 1272319
Signed-off-by: N Balachandran <nbalacha@redhat.com>
Reviewed-on: http://review.gluster.org/12404
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'tests/basic/tier/tier.t')
| -rwxr-xr-x | tests/basic/tier/tier.t | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/tests/basic/tier/tier.t b/tests/basic/tier/tier.t index 67927047729..fedd3bde1c9 100755 --- a/tests/basic/tier/tier.t +++ b/tests/basic/tier/tier.t @@ -2,6 +2,7 @@ . $(dirname $0)/../../include.rc . $(dirname $0)/../../volume.rc +. $(dirname $0)/../../tier.rc LAST_BRICK=3 CACHE_BRICK_FIRST=4 @@ -20,10 +21,6 @@ function sleep_first_cycle { sleep $mod } -# Grab md5sum without file path (failed attempt notifications are discarded). -function fingerprint { - md5sum $1 2> /dev/null | grep --only-matching -m 1 '^[0-9a-f]*' -} function file_on_slow_tier { found=0 @@ -79,49 +76,6 @@ function file_on_fast_tier { fi } -function confirm_tier_removed { - $CLI system getspec $V0 | grep $1 - if [ $? == 0 ]; then - echo "1" - else - echo "0" - fi -} - -function confirm_vol_stopped { - $CLI volume stop $1 - if [ $? == 0 ]; then - echo "0" - else - echo "1" - fi -} - -function check_counters { - index=0 - ret=0 - rm -f /tmp/tc*.txt - echo "0" > /tmp/tc2.txt - - $CLI volume rebalance $V0 tier status | grep localhost > /tmp/tc.txt - - promote=`cat /tmp/tc.txt |awk '{print $2}'` - demote=`cat /tmp/tc.txt |awk '{print $3}'` - if [ "${promote}" != "${1}" ]; then - echo "1" > /tmp/tc2.txt - - elif [ "${demote}" != "${2}" ]; then - echo "2" > /tmp/tc2.txt - fi - - # temporarily disable non-Linux tests. - case $OSTYPE in - NetBSD | FreeBSD | Darwin) - echo "0" > /tmp/tc2.txt - ;; - esac - cat /tmp/tc2.txt -} cleanup |